岗位批量导入优化

Reviewed-on: #300

src/com/engine/organization/mapper/job/JobMapper.java

@@ -148,7 +148,7 @@ public interface JobMapper {
 
     int selectByConditions(@Param("resourcePO") ResourcePO resourcePO);
 
-    int selectByE9(@Param("jobTitleName") String jobTitleName,@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
+    Integer selectByE9(@Param("jobTitleName") String jobTitleName,@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
 
     List<String> listUsedId();
 

src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

@@ -1,5 +1,6 @@
 package com.engine.organization.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.api.browser.bean.BrowserBean;
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
@@ -252,9 +253,12 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
         List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));
         List<Integer> integerList  = roleIds.stream()
+                .filter(s -> !s.trim().isEmpty())
                 .map(Integer::parseInt)
                 .collect(Collectors.toList());
-        detachListById.addAll(MapperProxyFactory.getProxy(ManagerDetachMapper.class).selectDetachListByManager(integerList));
+        if (!CollectionUtil.isEmpty(integerList)) {
+            detachListById.addAll(MapperProxyFactory.getProxy(ManagerDetachMapper.class).selectDetachListByManager(integerList));
+        }
         for (ManagerDetachPO managerDetachPO : detachListById) {
             List<Integer> ids = Stream.of(managerDetachPO.getJclRolelevel().split(",")).map(Integer::parseInt).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(ids)) {

src/com/engine/organization/util/saveimport/JobInfoImportUtil.java

@@ -185,7 +185,7 @@ public class JobInfoImportUtil {
                         //1.岗位在所属职务下是否存在
                         jobTitleId = MapperProxyFactory.getProxy(JobMapper.class).selectByE9(jobTitleName, jobactivitymark, jobgroupremark);
                         if (null == jobTitleId) {
-                            historyDetailPO.setOperateDetail(cellValue + "在系统岗职位体系中未匹配到数据，请检查职务和类别是否正确");
+                            historyDetailPO.setOperateDetail("【"+cellValue+"】" + "在系统岗职位体系中未匹配到数据，请检查职务和类别是否正确");
                             historyDetailPO.setStatus("0");
                             OrgImportUtil.saveImportDetailLog(historyDetailPO);
                             continue nextRow;
@@ -207,7 +207,13 @@ public class JobInfoImportUtil {
                 continue;
             }
 
-            String jobNo = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId)) + "-" +departmentId;
+            String jobNo = "";
+
+            String jobTitlescode = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId));
+            if (!"".equals(jobTitlescode)) {
+                jobNo = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId)) + "-" +departmentId;
+            }
+
             JobPO jobPO = JobPO.builder()
                     .jobNo(jobNo)
                     .isKey(isKey)