From 1d0cb1d90488b9fbc13b02e879ed93224890bfb7 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 31 Dec 2024 23:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A7=9F=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper_xml/TenantMapperEx.xml   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
index 8c1b6707..ede9af44 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml
@@ -9,18 +9,23 @@
     </resultMap>
 
     <select id="selectByConditionTenant" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="ResultMapEx">
-        select t.*, r.id roleId, r.name roleName,
+        select t.*,
+        (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=t.tenant_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=t.tenant_id limit 0,1) roleName,
         (select count(jsh_user.id) from jsh_user where jsh_user.status='0' and jsh_user.delete_flag=0 and jsh_user.tenant_id=t.tenant_id) userCount
         from jsh_tenant t
         left join jsh_user_business ub on ub.key_id = t.tenant_id and ifnull(ub.delete_flag,'0') !='1'
-        left join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
         where ub.type='UserRole'
         <if test="loginName != null">
             <bind name="bindLoginName" value="'%'+loginName+'%'"/>
             and t.login_name like #{bindLoginName}
         </if>
         <if test="roleId != null and roleId != ''">
-            and r.id = #{roleId}
+            and ub.value = concat("[",#{roleId},"]")
         </if>
         <if test="type != null and type != ''">
             and t.type = #{type}
@@ -44,14 +49,13 @@
         count(t.id)
         from jsh_tenant t
         left join jsh_user_business ub on ub.key_id = t.tenant_id and ifnull(ub.delete_flag,'0') !='1'
-        left join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
         where ub.type='UserRole'
         <if test="loginName != null">
             <bind name="bindLoginName" value="'%'+loginName+'%'"/>
             and t.login_name like #{bindLoginName}
         </if>
         <if test="roleId != null and roleId != ''">
-            and r.id = #{roleId}
+            and ub.value = concat("[",#{roleId},"]")
         </if>
         <if test="type != null and type != ''">
             and t.type = #{type}