人员列表 搜索条件

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

@@ -115,8 +115,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     public Map<String, Object> listPage(HrmResourceSearchParam params) {
         Map<String, Object> resultMap = new HashMap<>();
         OrganizationWeaTable<ScHrmResourceVO> table = new OrganizationWeaTable<>(user, ScHrmResourceVO.class);
-        //String sqlWhere = buildSqlWhere(params);
-        //table.setSqlwhere(sqlWhere);
+        String sqlWhere = buildSqlWhere(params);
+        table.setSqlwhere(sqlWhere);
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
@@ -206,7 +206,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         SearchConditionItem lastNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "姓名", "lastName");
-        SearchConditionItem managerIdItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "直接上级", "managerId");
+        SearchConditionItem managerIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "直接上级", "1", "managerId", "");
         SearchConditionItem companyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "companyId", "compBrowser");
         SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "161", "departmentId", "deptBrowser");
         SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone");
@@ -251,22 +251,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
      */
     private String buildSqlWhere(HrmResourceSearchParam params) {
         DBType dbType = DBType.get(new RecordSet().getDBType());
-        String sqlWhere = " where t.delete_type ='0' ";
+        String sqlWhere = " where 1=1 ";
         String lastName = params.getLastName();
         if (StringUtils.isNotBlank(lastName)) {
-            sqlWhere += " AND t.last_name " + dbType.like(lastName);
+            sqlWhere += " AND t.lastname " + dbType.like(lastName);
         }
         Long managerId = params.getManagerId();
         if (null != managerId) {
-            sqlWhere += " AND t.manager_id = '" + managerId + "'";
+            sqlWhere += " AND t.managerid = '" + managerId + "'";
         }
         Long companyId = params.getCompanyId();
         if (null != companyId) {
-            sqlWhere += " AND t.company_id = '" + companyId + "'";
+            sqlWhere += " AND t.subcompanyid1 = '" + companyId + "'";
         }
         Long departmentId = params.getDepartmentId();
         if (null != departmentId) {
-            sqlWhere += " AND t.department_id = '" + departmentId + "'";
+            sqlWhere += " AND t.departmentid = '" + departmentId + "'";
         }
         String telephone = params.getTelephone();
         if (StringUtils.isNotBlank(telephone)) {
@@ -278,11 +278,11 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         }
         String mobileCall = params.getMobileCall();
         if (StringUtils.isNotBlank(mobileCall)) {
-            sqlWhere += " AND t.mobile_call " + dbType.like(mobileCall);
+            sqlWhere += " AND t.mobilecall " + dbType.like(mobileCall);
         }
         Long jobTitle = params.getJobTitle();
         if (null != jobTitle) {
-            sqlWhere += " AND t.job_title = '" + jobTitle + "'";
+            sqlWhere += " AND t.jobtitle = '" + jobTitle + "'";
         }
 
         return sqlWhere;