From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/DataPrivilegeStaffV1ServiceDaoImplMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/DataPrivilegeStaffV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/DataPrivilegeStaffV1ServiceDaoImplMapper.xml
index ae60660..d86b1f0 100644
--- a/java110-db/src/main/resources/mapper/user/DataPrivilegeStaffV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/DataPrivilegeStaffV1ServiceDaoImplMapper.xml
@@ -19,8 +19,9 @@
<select id="getDataPrivilegeStaffInfo" parameterType="Map" resultType="Map">
select t.dps_id,t.dps_id dpsId,t.dp_id,t.dp_id dpId,t.staff_name,t.staff_name
staffName,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
- communityId,t.staff_id,t.staff_id staffId
+ communityId,t.staff_id,t.staff_id staffId,u.tel,u.email,u.address,u.sex
from data_privilege_staff t
+ left join u_user u on t.staff_id = u.user_id and u.status_cd = '0'
where 1 =1
<if test="dpsId !=null and dpsId != ''">
and t.dps_id= #{dpsId}
@@ -137,8 +138,8 @@
left join data_privilege_staff pu on t.user_id = pu.staff_id and pu.status_cd = '0' and pu.dp_id = #{dpId}
where t.status_cd = '0'
and pu.dp_id is null
- <if test="userName !=null and userName != ''">
- and t.name like concat('%', #{userName},'%')
+ <if test="staffName !=null and staffName != ''">
+ and t.name like concat('%', #{staffName},'%')
</if>
and su.store_id = #{storeId}
order by t.create_time desc
--
Gitblit v1.8.0