Commit 5b881a02 authored by fangxinjiang's avatar fangxinjiang

入离职模版导入调整-fxj

parent 38d802ac
...@@ -2529,13 +2529,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2529,13 +2529,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
R<SysAutoDictItemVo> domainDictR= null; R<SysAutoDictItemVo> domainDictR= null;
List<String> postConfigList = null; List<String> postConfigList = null;
for (EmployeeRegistrationNewVo excel : excelVOList) { for (EmployeeRegistrationNewVo excel : excelVOList) {
//非管理员判断是否有项目权限
if (!isAdmin){
if (!deptNos.contains(excel.getDeptNo())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!"));
continue;
}
}
selectVo = domainMap.get(excel.getDeptNo()); selectVo = domainMap.get(excel.getDeptNo());
if (null == selectVo){ if (null == selectVo){
//获取项目信息 //获取项目信息
...@@ -2556,6 +2549,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2556,6 +2549,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!")); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!"));
continue; continue;
} }
//非管理员判断是否有项目权限
if (!isAdmin){
if (!deptNos.contains(excel.getDeptNo())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!"));
continue;
}
}
//获取项目配置的字典值 //获取项目配置的字典值
postConfigList = postConfigMap.get(excel.getDeptNo()); postConfigList = postConfigMap.get(excel.getDeptNo());
......
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