岗位模块BUG修复

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -50,27 +50,27 @@ public class JobListDTO {
     /**
      * 所属分部
      */
-    @TableTitle(title = "所属分部", dataIndex = "parentComp", key = "parentComp")
+    @TableTitle(title = "所属分部", dataIndex = "compName", key = "compName")
     private String compName;
     /**
      * 所属部门
      */
-    @TableTitle(title = "所属部门", dataIndex = "parentDept", key = "parentDept")
+    @TableTitle(title = "所属部门", dataIndex = "deptName", key = "deptName")
     private String deptName;
     /**
      * 岗位序列
      */
-    @TableTitle(title = "岗位序列", dataIndex = "sequenceId", key = "sequenceId")
+    @TableTitle(title = "岗位序列", dataIndex = "sequenceName", key = "sequenceName")
     private String sequenceName;
     /**
      * 等级方案
      */
-    @TableTitle(title = "等级方案", dataIndex = "schemeId", key = "schemeId")
+    @TableTitle(title = "等级方案", dataIndex = "schemeName", key = "schemeName")
     private String schemeName;
     /**
      * 上级岗位
      */
-    @TableTitle(title = "上级岗位", dataIndex = "parentJob", key = "parentJob")
+    @TableTitle(title = "上级岗位", dataIndex = "parentJobName", key = "parentJobName")
     private String parentJobName;
     private Long parentJob;
     /**
@@ -85,6 +85,11 @@ public class JobListDTO {
     @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag")
     private Integer forbiddenTag;
 
+    /**
+     * 操作列
+     */
+    @TableTitle(title = "", dataIndex = "operate", key = "operate")
+    private String operate;
     /**
      * 子节点
      */

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

@@ -156,7 +156,7 @@
         <set>
             creator=#{creator},
             update_time=#{updateTime},
-            jobName=#{jobName},
+            job_name=#{jobName},
             parent_comp=#{parentComp},
             parent_dept=#{parentDept},
             sequence_id=#{sequenceId},

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

@@ -292,7 +292,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");
         isKeyItem.setDetailtype(3);
 
         conditionItems.add(jobNoItem);
@@ -348,7 +348,8 @@ public class JobServiceImpl extends Service implements JobService {
     public int saveBaseForm(JobSearchParam params) {
         List<JobPO> list = getJobMapper().listByNo(Util.null2String(params.getJobNo()));
         OrganizationAssert.isEmpty(list, "编号不允许重复");
-        JobPO jobPO = JobBO.convertParamsToPO(params, (long) user.getUID());
+        JobPO jobPO = JobBO.convertParamsToPO(params, user.getUID());
+        jobPO.setIsKey(null == jobPO.getIsKey() ? 0 : jobPO.getIsKey());
         // 设置对应的等级方案
         return getJobMapper().insertIgnoreNull(jobPO);
     }
@@ -358,6 +359,7 @@ public class JobServiceImpl extends Service implements JobService {
         JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
         String groupId = (String) params.get("viewCondition");
         JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID());
+        jobPO.setIsKey(null == jobPO.getIsKey() ? 0 : jobPO.getIsKey());
         int updateCount = 0;
         // 更新主表数据
         updateCount += getJobMapper().updateBaseJob(jobPO);
@@ -395,8 +397,10 @@ public class JobServiceImpl extends Service implements JobService {
             return;
         }
         DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getParentDept());
+        if (null != parentDept) {
             buildParentDepts(parentDept, builderDeparts);
         }
+    }
 
     /**
      * 添加查询元素的父级元素
@@ -410,8 +414,10 @@ public class JobServiceImpl extends Service implements JobService {
             return;
         }
         CompPO parentComp = getCompMapper().listById(compPO.getParentCompany());
+        if (null != parentComp) {
             buildParentComps(parentComp, builderComps);
         }
+    }
 
     /**
      * 获取集团
@@ -627,7 +633,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");
         isKeyItem.setDetailtype(3);
         // 工作地点
         SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
@@ -657,7 +663,7 @@ public class JobServiceImpl extends Service implements JobService {
         OrganizationAssert.notNull(jobPO, "数据不存在或数据已删除");
         jobNoItem.setValue(jobPO.getJobNo());
         jobNameItem.setValue(jobPO.getJobName());
-        isKeyItem.setValue(jobPO.getIsKey());
+        isKeyItem.setValue(null == jobPO.getIsKey() ? "0" : jobPO.getIsKey() + "");
         workplaceItem.setValue(jobPO.getWorkplace());
         descriptionItem.setValue(jobPO.getDescription());
         workDutyItem.setValue(jobPO.getWorkDuty());

src/com/engine/organization/transmethod/JobTransMethod.java

@@ -17,7 +17,7 @@ public class JobTransMethod {
     }
 
     public static String getIsKeySpan(String isKey) {
-        if ("0".equals(isKey))
+        if ("1".equals(isKey))
             return "是";
         else
             return "否";