BUG修复

src/com/engine/organization/entity/company/dto/CompListDTO.java

@@ -61,7 +61,7 @@ public class CompListDTO {
     /**
      * 禁用标记
      */
-    @TableTitle(title = "封存", dataIndex = "canceled", key = "canceled")
+    @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
     private Integer canceled;
 
     /**

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -79,7 +79,7 @@ public class DepartmentListDTO {
     /**
      * 禁用标记
      */
-    @TableTitle(title = "封存", dataIndex = "canceled", key = "canceled")
+    @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
     private int canceled;
     /**
      * 操作列

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

@@ -541,7 +541,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
-        //String sqlWhere = "";
         StringBuilder sb = new StringBuilder(" where 1=1 ");
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String value = Util.null2String(entry.getValue());
@@ -553,8 +552,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 sb.append(" and t.lastname ").append(dbType.like(value));
             }
             SearchConditionItem searchConditionItem = allFieldsMap.get(key);
-            buildDynamicSql(searchConditionItem, key, value, sb, dbType);
             // 根据不同的类型,不同的查询方式
+            buildDynamicSql(searchConditionItem, key, value, sb, dbType);
         }
         if (searchJobTitle) {
             String jobTitleIds = StringUtils.join(jobTitleList, ",");