From 68a42ee3b831e9f973c817a9792a79e5f0e4d9f3 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 03 三月 2025 09:10:10 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr --- ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml index f927978..6487371 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml @@ -29,4 +29,35 @@ ${ew.customSqlSegment} </if> </select> + + <!-- 鑾峰彇鐢ㄦ埛閮ㄩ棬 --> + <select id="selectUserDepartmentLimsName" resultType="java.lang.String"> + select dl.name + from user u + left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1 + where u.id = #{userId} + limit 1 + </select> + + <!-- 鏌ヨ鐢ㄦ埛鍜岄儴闂� --> + <select id="selectNameAnddepartment" resultType="java.util.Map"> + select u.name userName, + dl.name department + from user u + left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1 + where find_in_set(u.id, #{participant}) + </select> + + <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 --> + <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User"> + select u.id, + c.company, + u.name, + c.code, + u.phone, + c.id departId + from user u + left join custom c on u.company = c.id + where u.id = #{userId} + </select> </mapper> -- Gitblit v1.9.3