BUG 修复

src/com/api/browser/service/impl/JobBrowserService.java

@@ -119,11 +119,11 @@ public class JobBrowserService extends BrowserService {
             sqlWhere += " AND t.job_name " + dbType.like(jobName);
         }
         String ecCompany = Util.null2String(params.get("ecCompany"));
-        if (StringUtils.isNotBlank(jobName)) {
+        if (StringUtils.isNotBlank(ecCompany)) {
             sqlWhere += " AND t.ec_company = '" + Long.parseLong(ecCompany) + "'";
         }
         String ecDepartment = Util.null2String(params.get("ecDepartment"));
-        if (StringUtils.isNotBlank(jobName)) {
+        if (StringUtils.isNotBlank(ecDepartment)) {
             sqlWhere += " AND t.ec_department = '" + Long.parseLong(ecDepartment) + "'";
         }
         String treeKey = Util.null2String(params.get("treeKey"));

src/com/engine/organization/mapper/comp/CompMapper.java

@@ -149,7 +149,7 @@ public interface CompMapper {
      *
      * @return
      */
-    int getMaxShowOrder();
+    Integer getMaxShowOrder();
 
     /**
      * 根据名称和上级查找ID

src/com/engine/organization/mapper/department/DepartmentMapper.java

@@ -121,7 +121,7 @@ public interface DepartmentMapper {
      *
      * @return
      */
-    int getMaxShowOrder();
+    Integer getMaxShowOrder();
 
     /**
      * 根据名称、上级 查询部门元素

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

@@ -141,7 +141,7 @@ public interface JobMapper {
      *
      * @return
      */
-    int getMaxShowOrder();
+    Integer getMaxShowOrder();
 
     /**
      * 根据名字和上级查询岗位信息

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

@@ -145,7 +145,10 @@ public class CompServiceImpl extends Service implements CompService {
         compNo = repeatDetermine(compNo);
         params.put("comp_no", compNo);
         if (null == params.get("show_order") || StringUtils.isBlank(params.get("show_order").toString())) {
-            int maxShowOrder = getCompMapper().getMaxShowOrder();
+            Integer maxShowOrder = getCompMapper().getMaxShowOrder();
+            if (null == maxShowOrder) {
+                maxShowOrder = 0;
+            }
             params.put("show_order", maxShowOrder + 1);
         }
         Long id = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", null);

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

@@ -196,7 +196,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         deptNo = repeatDetermine(deptNo);
         params.put("dept_no", deptNo);
         if (StringUtils.isBlank(Util.null2String(params.get("show_order")))) {
-            int maxShowOrder = getDepartmentMapper().getMaxShowOrder();
+            Integer maxShowOrder = getDepartmentMapper().getMaxShowOrder();
+            if (null == maxShowOrder) {
+                maxShowOrder = 0;
+            }
             params.put("show_order", maxShowOrder + 1);
         }
         Long departmentId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", null);

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

@@ -321,7 +321,10 @@ public class JobServiceImpl extends Service implements JobService {
         }
 
         if (StringUtils.isBlank(params.get("show_order").toString())) {
-            int maxShowOrder = getJobMapper().getMaxShowOrder();
+            Integer maxShowOrder = getJobMapper().getMaxShowOrder();
+            if (null == maxShowOrder) {
+                maxShowOrder = 0;
+            }
             params.put("show_order", maxShowOrder + 1);
         }
         Long jobId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);