From 15794ec534b23747b812f6e479ab53420be46fdf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 21 十月 2024 18:00:30 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 62eb9c4..16a7154 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -27,7 +27,7 @@
sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
- sd.name as companyName
+ sd.company_name_path as companyName
FROM `SYSTEM_USER` usr
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
@@ -60,12 +60,18 @@
<if test="dto.mobile != null and dto.mobile != ''">
AND usr.`MOBILE` LIKE CONCAT('%', #{dto.mobile}, '%')
</if>
+ <if test="dto.companyName != null and dto.companyName != ''">
+ AND sd.`company_name_path` LIKE CONCAT('%', #{dto.companyName}, '%')
+ </if>
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
<if test="dto.memberType != null ">
AND m.`type` = #{dto.memberType}
</if>
+ <if test="dto.companyId != null ">
+ AND usr.COMPANY_ID = #{dto.companyId}
+ </if>
<if test="dto.companyType != null ">
AND sd.`type` = #{dto.companyType}
</if>
--
Gitblit v1.9.3