From 453d4afe97c690bab4d52bd22b6be40cc9cab74a Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 14 Feb 2023 17:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/resource/ResourceMapper.xml        | 11 +++-----
 .../service/impl/HrmResourceServiceImpl.java  | 25 +++++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml
index a78fcf73..99b673da 100644
--- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/ResourceMapper.xml
@@ -111,12 +111,9 @@
         from jcl_org_hrmresource t where delete_type = 0 and work_code = #{workCode}
     </select>
     <select id="listDetachAll" resultType="com.engine.organization.entity.hrmresource.vo.HrmResourceVO">
-        SELECT t.last_name as lastName,d.departmentname as departmentName,
-        c.subcompanyname as companyName,t.mobile,t.telephone,t1.last_name as managerName
-        from jcl_org_hrmresource t
-        left join hrmdepartment d on t.ec_department = d.id
-        left join hrmsubcompany c on t.ec_company = c.id
-        left join jcl_org_hrmresource t1 on t.manager_id = t1.id
+        select t.lastname as lastname, d.departmentname as departmentname, c.subcompanyname as companyname, t.mobile,
+        t.telephone, t1.lastname as managername from hrmresource t left join hrmdepartment d on t.departmentid = d.id
+        left join hrmsubcompany c on t.subcompanyid1 = c.id left join hrmresource t1 on t.managerid = t1.id
         where 1 = 1
         <if test="ids != null and ids.size > 0">
             AND t.id IN
@@ -128,7 +125,7 @@
         <foreach collection="companyIds" open="(" item="companyId" separator="," close=")">
             #{companyId}
         </foreach>
-        order by t.show_order asc;
+        order by t.dsporder asc
     </select>
 
     <select id="getMaxShowOrder" resultType="java.lang.Long">
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 96c2668f..dfbe485f 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -637,20 +637,31 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
         StringBuilder sb = new StringBuilder(" where 1=1 ");
+        if (params.containsKey("lastName")) {
+            sb.append(" and t.status = 1");
+        }
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String key = entry.getKey();
             String value = Util.null2String(entry.getValue());
+            if (StringUtils.isBlank(value)) {
+                continue;
+            }
             if ("lastName".equals(key)) {
-                if (StringUtils.isNotBlank(value)) {
-                    sb.append(" and t.lastname ").append(dbType.like(value));
+                sb.append(" and t.lastname ").append(dbType.like(value));
+            }
+            if ("companyId".equals(key)) {
+                sb.append(" and t.subcompanyid1 ='").append(value).append("'");
+            }
+            if ("departmentId".equals(key)) {
+                sb.append(" and t.departmentId ='").append(value).append("'");
+            }
+            if ("jobTitle".equals(key)) {
+                JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
+                if (null != jobById) {
+                    sb.append(" and t.jobtitle ='").append(Util.null2String(jobById.getEcJobTitle())).append("' and t.subcompanyid1 = '").append(Util.null2String(jobById.getEcCompany())).append("' and t.departmentId ='").append(Util.null2String(jobById.getEcDepartment())).append("'");
                 }
-                sb.append(" and t.status = 1");
-                continue;
             }
 
-            if (StringUtils.isBlank(value)) {
-                continue;
-            }
             SearchConditionItem searchConditionItem = allFieldsMap.get(key);
             // 根据不同的类型,不同的查询方式
             buildDynamicSql(searchConditionItem, key, value, sb, dbType);