Merge pull request 'BUG修复' (#106) from feature/dxf into develop

Reviewed-on: #106

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

@@ -471,6 +471,7 @@
         where ec_company = #{resourcePO.subcompanyid1}
           and ec_department = #{resourcePO.departmentid}
           and ec_jobtitle = #{resourcePO.jobtitle}
+          and delete_type = 0
     </select>
 
     <select id="getIdByNameAndPid" resultType="java.lang.Long">

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

@@ -381,7 +381,11 @@ public class CompServiceImpl extends Service implements CompService {
 
         Map<String, Object> map = new HashMap<>();
         map.put("id", companyId.toString());
-        map.put("supsubcomid", targetCompanyId.toString());
+        if (null == targetCompanyId) {
+            map.put("supsubcomid", "0");
+        } else {
+            map.put("supsubcomid", targetCompanyId.toString());
+        }
         new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map).sync();
         return companyId;
     }

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

@@ -214,9 +214,9 @@ public class JobServiceImpl extends Service implements JobService {
         // 名称
         SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobTitleName");
         // 所属分部
-        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", "");
+        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subcompanyid1", "");
         // 所属部门
-        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", "");
+        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", "");
         // 是否关键岗
         List<SearchConditionOption> isKeyOptions = new ArrayList<>();
         SearchConditionOption yesOption = new SearchConditionOption("0", "否");
@@ -581,7 +581,7 @@ public class JobServiceImpl extends Service implements JobService {
         //2.数据过滤
         //3.数据插入
         resourcePOS.forEach(resourcePO -> {
-            if (Objects.nonNull(resourcePO)) {
+            if (Objects.nonNull(resourcePO) && null != resourcePO.getJobtitle()) {
                 int count = getJobMapper().selectByConditions(resourcePO);
                 if (count == 0) {
                     JobPO jobPO = JobPO.builder()