BUG修复

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

@@ -389,6 +389,9 @@
         <if test=" jobPO.parentDept != null ">
             and t.parent_dept = #{jobPO.parentDept}
         </if>
+        <if test=" jobPO.parentJob != null ">
+            and t.parent_job = #{jobPO.parentJob}
+        </if>
         <if test=" jobPO.ecCompany != null ">
             and t.ec_company = #{jobPO.ecCompany}
         </if>

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

@@ -582,8 +582,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         deptBrowserItem.setRules("required|string");
         SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
         mergeNameItem.setRules("required|string");
-        String departmentName = getDepartmentMapper().getDeptNameById(id);
-        mergeNameItem.setValue(departmentName);
 
         condition.add(deptBrowserItem);
         condition.add(mergeNameItem);

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

@@ -29,6 +29,7 @@ import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.extend.ExtendTitleMapper;
 import com.engine.organization.mapper.hrmresource.HrmRelationMapper;
+import com.engine.organization.mapper.hrmresource.HrmResourceMapper;
 import com.engine.organization.mapper.hrmresource.SystemDataMapper;
 import com.engine.organization.mapper.job.JobMapper;
 import com.engine.organization.mapper.post.PostInfoMapper;
@@ -143,6 +144,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return MapperProxyFactory.getProxy(JobMapper.class);
     }
 
+    private HrmResourceMapper getHrmResourceMapper() {
+        return MapperProxyFactory.getProxy(HrmResourceMapper.class);
+    }
+
     private ExtendTitleMapper getExtendTitleMapper() {
         return MapperProxyFactory.getProxy(ExtendTitleMapper.class);
     }
@@ -200,6 +205,13 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             // 等级方案、岗位序列、职等职级
 
         }
+        String showOrder = Util.null2String(params.get("show_order"));
+        // 初始化排序字段
+        if (StringUtils.isBlank(showOrder)) {
+            Long maxId = getHrmResourceMapper().getMaxId();
+            params.put("show_order", null == maxId ? 1 : maxId + 1);
+        }
+
         // 新增EC人员,新增成功后，新增到聚才林人员表
         Map<String, Object>  syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.RESOURCE, OperateTypeEnum.ADD, params).sync();
         String ecResourceId = Util.null2String(syncMap.get("id"));

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

@@ -1114,6 +1114,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                         map.put("parent_job", parentJobId);
                         jobName = split[split.length - 1];
                         map.put("job_name", jobName);
+                        map.put("is_key", StringUtils.isBlank(Util.null2String(map.get("is_key"))) ? 0 : map.get("is_key"));
                     }
                 }
             }

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

@@ -229,7 +229,7 @@ public class JobServiceImpl extends Service implements JobService {
         SearchConditionOption noOption = new SearchConditionOption("1", "是");
         isKeyOptions.add(yesOption);
         isKeyOptions.add(noOption);
-        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "forbiddenTag");
+        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey");
         // 工作地点
         SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
         // 禁用标记
@@ -724,6 +724,7 @@ public class JobServiceImpl extends Service implements JobService {
                 && StringUtil.isEmpty(jobPO.getWorkAuthority())
                 && null == jobPO.getParentComp()
                 && null == jobPO.getParentDept()
+                && null == jobPO.getParentJob()
                 && null == jobPO.getSequenceId()
                 && null == jobPO.getSchemeId()
                 && null == jobPO.getIsKey()

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

@@ -2,12 +2,8 @@ package com.engine.organization.service.impl;
 
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
-import com.api.browser.bean.SearchConditionOption;
-import com.api.browser.util.ConditionType;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.core.impl.Service;
-import com.engine.email.util.EmailCommonCondition;
-import com.engine.email.util.EmailConditionItem;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.logview.param.LogViewSearchParam;
 import com.engine.organization.entity.logview.vo.LogViewVO;
@@ -53,9 +49,9 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,"操作时间","operateDate");
 
         // 操作者部门
-        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "161", "departmentId", "deptBrowser");
+        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "4", "departmentId", "");
         // 操作者分部
-        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "161", "companyId", "compBrowser");
+        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "164", "companyId", "");
 
         conditionItems.add(operatorId);
         conditionItems.add(dateItem);