From 342d5fb8afc765de0dab42457793358d9a885356 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 15 Apr 2024 21:41:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=89=E6=96=B9=E6=A0=87=E8=AF=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=B1=E5=85=AC=E5=8F=B8=E8=A1=A8=EF=BC=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=87=B3=E9=83=A8=E9=97=A8=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/admin/UserTenantMapper.xml         | 59 ++++++-------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml
index 1cc9fd39..9d14fab4 100644
--- a/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml
+++ b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml
@@ -42,66 +42,41 @@
 			</trim>
 		</where>
 		<if test="page != null">
-			<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if> 
+			<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
 			limit ${page.start}, ${page.Pagesize}
 		</if>
 	</sql>
 
 	<select id="listCount" resultType="java.lang.Long" parameterType="java.util.Map">
-		select
-		    count(ten.ID)
-		from
-		 S_TENANT_T ten
-		where
-		    ten.OTHERNO = #{otherno}
-		    and
-			ten.ID in (
-				select ue.TENANTID from
-				S_USER_T us,
-				S_USER_TENANT_T ue where us.LOGINNAME = #{loginname}
-			)
-
+		select count(u.ID) from s_user_t u
+				left join s_userobject_t uo on u.id = uo.USERID
+				left join s_department_t dm on dm.id = uo.DEPARTID
+		where u.LOGINNAME =#{loginname}  and dm.DESCRIPTION = #{otherno}
 	</select>
 
 	<select id="listOthernoCount" resultType="java.lang.Long" parameterType="java.util.Map">
 		select
-			count(ten.ID)
+			count(dm.ID)
 		from
-			S_TENANT_T ten
+			s_department_t dm
 		where
-			ten.OTHERNO = #{otherno}
+			dm.DESCRIPTION = #{otherno}
 	</select>
 
 	<select id="listLoginNameCount" resultType="java.lang.Long" parameterType="java.util.Map">
-		select
-			count(ten.ID)
-		from
-			S_TENANT_T ten
-		where
-			ten.OTHERNO = #{otherno}
-		  and
-				ten.ID in (
-				select ue.TENANTID from
-									   S_USER_T us,
-									   S_USER_TENANT_T ue where us.LOGINNAME = #{loginname}
-			)
+		select count(u.ID) from s_user_t u
+								 left join s_userobject_t uo on u.id = uo.USERID
+								 left join s_department_t dm on dm.id = uo.DEPARTID
+		where u.LOGINNAME =#{loginname}  and dm.DESCRIPTION = #{otherno}
+
 
 	</select>
 
 
 	<select id="listMobileCount" resultType="java.lang.Long" parameterType="java.util.Map">
-		select
-			count(ten.ID)
-		from
-			S_TENANT_T ten
-		where
-			ten.OTHERNO = #{otherno}
-		  and
-				ten.ID in (
-				select ue.TENANTID from
-									   S_USER_T us,
-									   S_USER_TENANT_T ue where us.MOBILE = #{mobile}
-			)
-
+		select count(u.ID) from s_user_t u
+									left join s_userobject_t uo on u.id = uo.USERID
+									left join s_department_t dm on dm.id = uo.DEPARTID
+		where u.MOBILE =#{mobile}  and dm.DESCRIPTION = #{otherno}
 	</select>
 </mapper>