From d6c7f1190d8cdaa302be92add7e01efa78141b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 29 Aug 2021 21:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper_xml/UserMapperEx.xml  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
index fb6cddec..16d8f560 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -10,15 +10,17 @@
         <result column="roleName" jdbcType="VARCHAR" property="roleName" />
     </resultMap>
     <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="ResultMapEx">
+        select tb.*,
+        (select r.id from jsh_user_business ub
+        left join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
+        where ub.type='UserRole' and ub.key_id=tb.id limit 0,1) roleId,
+        (select r.name from jsh_user_business ub
+        left join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
+        where ub.type='UserRole' and ub.key_id=tb.id limit 0,1) roleName
+        from (
         select user.id, user.username, user.login_name, user.position, user.email, user.phonenum,
         user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,user.status,org.org_abr,
-        rel.user_blng_orga_dspl_seq,rel.id as orgaUserRelId,
-        (select r.id from jsh_user_business ub
-        inner join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
-        where ub.type='UserRole' and ub.key_id=user.id limit 0,1) roleId,
-        (select r.name from jsh_user_business ub
-        inner join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
-        where ub.type='UserRole' and ub.key_id=user.id limit 0,1) roleName
+        rel.user_blng_orga_dspl_seq,rel.id as orgaUserRelId
         FROM jsh_user user
         left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
         left join jsh_organization org on rel.orga_id=org.id and ifnull(org.delete_flag,'0') !='1'
@@ -36,6 +38,7 @@
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>
+        ) tb
     </select>
     <select id="countsByUser" resultType="java.lang.Long">
         select count(user.id)