岗位批量导入优化

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -149,7 +149,7 @@
                      groupid,
                      #{scopeId} as scopeId,
                      'hrm'      as tablename
-              FROM hrm_formfield where isuse = 1) hrmallfield
+              FROM hrm_formfield) hrmallfield
         WHERE FIELDHTMLTYPE != '6' and groupid IN (SELECT id FROM hrm_fieldgroup WHERE grouptype = #{scopeId})
         ORDER BY hrmallfield.groupid, hrmallfield.fieldorder
     </select>

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/FunctionOutStaffServiceImpl.java

@@ -86,9 +86,8 @@ public class FunctionOutStaffServiceImpl {
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
                 .sum();
-        Integer sums = sum + staffPO.getPermanentNum();
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
+            OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
         }
         staffPO.setFreezeNum(sum);
         buildStaffPO(staffPO);

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)