From c46d1d8c3b9875f051a6ec3c4a1d3fa7bd32e5db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:21 +0800
Subject: [PATCH] 新增库存管理 新增库存明细

---
 rsf-server/src/main/resources/mapper/system/UserMapper.xml |   39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/rsf-server/src/main/resources/mapper/system/UserMapper.xml b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
index 69fe1be..fd60018 100644
--- a/rsf-server/src/main/resources/mapper/system/UserMapper.xml
+++ b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
@@ -2,27 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vincent.rsf.server.system.mapper.UserMapper">
 
-    <!-- 鏍规嵁璐﹀彿鏌ヨ -->
-    <select id="selectByUsername" resultType="com.vincent.rsf.server.system.entity.User">
-        select * from sys_user
-        where 1=1
-        and deleted = 0
-        and username = #{username}
-        <if test="tenantId != null">
-            AND tenant_id = #{tenantId}
-        </if>
-    </select>
-
     <select id="selectPageRel" resultType="com.vincent.rsf.server.system.entity.User">
         select
-        su.*
+        DISTINCT su.*
         from sys_user su
         left join sys_dept sd on su.dept_id = sd.id
-        left join (
-            select *
-            from sys_user_role sur
-            group by sur.user_id
-        ) sur on sur.user_id = su.id
+        left join sys_user_role sur on sur.user_id = su.id
         where 1=1
         and su.deleted = 0
 
@@ -89,4 +74,24 @@
         </if>
     </select>
 
+    <select id="selectByUsernameWithoutTenant" resultType="com.vincent.rsf.server.system.entity.User">
+        select * from sys_user
+        where 1=1
+        and deleted = 0
+        and username = #{username}
+        <if test="tenantId != null">
+            AND tenant_id = #{tenantId}
+        </if>
+    </select>
+
+    <select id="selectByEmailWithoutTenant" resultType="com.vincent.rsf.server.system.entity.User">
+        select * from sys_user
+        where 1=1
+        and deleted = 0
+        and email = #{email}
+        <if test="tenantId != null">
+            AND tenant_id = #{tenantId}
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.9.1