From 3aac821b17332fae60cd594a8cacd0604fc68255 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jan 2024 13:53:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081445=20=E4=B8=93=E9=A1=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93-=E4=BE=9D=E6=8D=AE=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E7=BC=BA=E5=B0=91=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessProjectStandardTermUser.java           | 6 ++++++
 .../mapper/xml/ProcessProjectStandardTermUserMapper.xml  | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
index 3ff10e56..64d38a83 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java
@@ -197,4 +197,10 @@ public class ProcessProjectStandardTermUser {
     @TableField(exist = false)
     @ApiModelProperty(value="姓名")
     private String realName;
+    /**
+     * 部门id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="部门id")
+    private String departId;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml
index 82709d20..a8f24687 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml
@@ -34,8 +34,10 @@
   </sql>
 
   <select id="selectPageByUser" resultMap="BaseResultMap">
-    select ppstu.* from process_project_standard_term_user ppstu left join
-                  sys_user su on ppstu.design_engineer = su.id
+    select ppstu.* from process_project_standard_term_user ppstu
+    left join sys_user su on ppstu.design_engineer = su.id
+    left join sys_user_depart sud on su.id = sud.user_id
+    left join sys_depart sd on sud.user_id = sd.id
     <where>
       <if test="termUser.termId != null and termUser.termId != ''">
         ppstu.term_id = #{termUser.termId}
@@ -52,6 +54,9 @@
       <if test="termUser.realName != null and termUser.realName != ''">
         and su.realname like concat('%', #{termUser.realName}, '%')
       </if>
+      <if test="termUser.departId != null and termUser.departId != ''">
+        and FIND_IN_SET(#{termUser.departId} , su.depart_ids)
+      </if>
     </where>
 
   </select>