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 @@
and a.org_id like concat('%',#{org_id},'%')
and a.company_id like concat('%',#{companyId},'%')
and p.organ_id = #{organId}
+ and p.mobile_phone like concat('%',#{mobilePhone},'%')
+ and p.person_Name like concat('%',#{personName},'%')
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})