Commit 39a0c9a8 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 80477aac
...@@ -2786,11 +2786,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2786,11 +2786,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.map(R::getMsg) .map(R::getMsg)
.orElse("未知错误"); .orElse("未知错误");
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMessageList.add(new ErrorMessage(excel.getRowIndex(),
"访问员工基础服务异常:" + errorMsg)); "访问员工基础服务异常:" + errorMsg, excel));
continue; continue;
} }
if (null == domainR.getData()){ if (null == domainR.getData()){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "未查询到具体项目信息")); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "未查询到具体项目信息", excel));
continue; continue;
} }
selectVo = domainR.getData(); selectVo = domainR.getData();
...@@ -2798,13 +2798,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2798,13 +2798,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
//判断项目是否可用 (务状态:0 正常 1 停止服务 2 冻结) //判断项目是否可用 (务状态:0 正常 1 停止服务 2 冻结)
if (!CommonConstants.ZERO_STRING.equals(selectVo.getStopFlag())) { if (!CommonConstants.ZERO_STRING.equals(selectVo.getStopFlag())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!")); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!", excel));
continue; continue;
} }
//非管理员判断是否有项目权限 //非管理员判断是否有项目权限
if (!isAdmin){ if (!isAdmin){
if (!deptNos.contains(excel.getDeptNo())){ if (!deptNos.contains(excel.getDeptNo())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!")); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!", excel));
continue; continue;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment