From a14706e2a374d65764a68d8ab1193a9d3c800da3 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Mon, 12 May 2025 13:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=BF=9E=E6=8E=A5=E5=99=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzya/frame/sysnew/user/entity/SysUserEntity.java  | 11 +++++++++++
 .../hzya/frame/sysnew/user/entity/SysUserEntity.xml   |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java b/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java
index 3001bd91..7280a09d 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java
@@ -88,6 +88,9 @@ public class SysUserEntity extends BaseEntity {
 
     private String wxUserId;
 
+    //sys_flow模块用
+    private String flowClassId;
+
     public String getDdUserId() {
         return ddUserId;
     }
@@ -247,5 +250,13 @@ public class SysUserEntity extends BaseEntity {
     public void setPersonCode(String personCode) {
         this.personCode = personCode;
     }
+
+    public String getFlowClassId() {
+        return flowClassId;
+    }
+
+    public void setFlowClassId(String flowClassId) {
+        this.flowClassId = flowClassId;
+    }
 }
 
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.xml
index a17d774e..3642ff41 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.xml
@@ -291,6 +291,7 @@
         ,a.org_id
         ,a.company_id
         ,p.person_Name
+        ,p.person_code
         ,p.mobile_phone
         ,o.organ_name
         from
@@ -323,8 +324,10 @@
             <if test="org_id != null and org_id != ''">and a.org_id like concat('%',#{org_id},'%')</if>
             <if test="companyId != null and companyId != ''">and a.company_id like concat('%',#{companyId},'%')</if>
             <if test="organId != null and organId != ''">and p.organ_id  = #{organId}</if>
+            <if test="mobilePhone != null and mobilePhone != ''">and p.mobile_phone like concat('%',#{mobilePhone},'%')</if>
+            <if test="personName != null and personName != ''">and p.person_Name like concat('%',#{personName},'%')</if>
             and a.sts='Y'
-            and a.id not in (select user_id from sys_flow_class_rule where sts = 'Y')
+            and a.id not in (select user_id from sys_flow_class_rule where sts = 'Y' and flow_class_id = #{flowClassId})
         </trim>
     </select>