|
|
@@ -188,7 +188,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
|
|
|
initMap.put("reason","获取实验室安全准入资格");
|
|
|
remoteExamService.initCreditPoints(initMap);
|
|
|
}
|
|
|
- //haiKangDoorService.addUserDoorByApplay(applyVO, tokenService.getLoginUser());
|
|
|
}
|
|
|
labSecurityApply.setUpdateTime(DateUtils.getNowDate());
|
|
|
labSecurityApply.setUpdateBy(SecurityUtils.getUsername());
|
|
|
@@ -270,7 +269,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
|
|
|
}
|
|
|
|
|
|
//获取登录用户信息
|
|
|
- //SysUser sysUser = tokenService.getLoginUser().getSysUser();
|
|
|
log.info("安全准入申请,登录用户信息2:"+ JSONObject.toJSONString(sysUser));
|
|
|
labSecurityApplyVO.setUserId(sysUser.getUserId());
|
|
|
labSecurityApplyVO.setUserName(sysUser.getNickName());
|
|
|
@@ -309,7 +307,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
|
|
|
labSecurityApplyVO.setUserId(sysUser.getUserId());
|
|
|
labSecurityApplyVO.setUserName(sysUser.getNickName());
|
|
|
labSecurityApplyVO.setUserType(sysUser.getUserType());
|
|
|
- //labSecurityApplyVO.setCreatTime(new Date());
|
|
|
//申请项录入
|
|
|
int id= labSecurityApplyMapper.updateLabSecurityApply(labSecurityApplyVO);
|
|
|
|
|
|
@@ -369,8 +366,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
|
|
|
@DataScope(deptAlias = "t" , userAlias = "t" , permi = PerPrefix.LABORATORY_APPLY)
|
|
|
public List<LabSecurityApplyVO> selectApplyListSchool(LabSecurityApplyVO labSecurityApplyVO) {
|
|
|
//获取登录用户信息
|
|
|
- //SysUser sysUser = tokenService.getLoginUser().getSysUser();
|
|
|
- //labSecurityApplyVO.setDeptId(sysUser.getDept().getDeptId());
|
|
|
return labSecurityApplyMapper.selectApplyListSchool(labSecurityApplyVO);
|
|
|
}
|
|
|
|
|
|
@@ -383,8 +378,6 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
|
|
|
@DataScope(deptAlias = "t" , userAlias = "t" , permi = PerPrefix.LABORATORY_APPLY)
|
|
|
public List<Map<String, Object>> selectApplyListSchoolColumn(LabSecurityApply labSecurityApply) {
|
|
|
//获取登录用户信息
|
|
|
- //SysUser sysUser = tokenService.getLoginUser().getSysUser();
|
|
|
- //labSecurityApply.setDeptId(sysUser.getDept().getDeptId());
|
|
|
return labSecurityApplyMapper.selectApplyListSchoolColumn(labSecurityApply);
|
|
|
}
|
|
|
|