From c3129ce2bd876e5b5f5c2f305fbc64c7050b8290 Mon Sep 17 00:00:00 2001
From: 王彪总 <thisjava@163.com>
Date: Thu, 28 May 2026 18:09:39 +0800
Subject: [PATCH] fix(config): 更新配置文件和修复分页计算问题

---
 java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml     | 14 ++++++++++++++
 service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java |  6 ++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml
index ca3911a..5856ec3 100644
--- a/java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml
@@ -226,6 +226,13 @@
         <if test="email !=null and email != ''">
             and t.email= #{email}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.user_id in (
+                select uosr.staff_id from u_org_staff_rel uosr
+                inner join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
+                where uo.store_id = #{storeId} and uosr.status_cd = '0'
+            )
+        </if>
     </select>
 
     <select id="getSystemUsers" parameterType="Map" resultType="Map">
@@ -253,6 +260,13 @@
         <if test="email !=null and email != ''">
             and t.email= #{email}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.user_id in (
+                select uosr.staff_id from u_org_staff_rel uosr
+                inner join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
+                where uo.store_id = #{storeId} and uosr.status_cd = '0'
+            )
+        </if>
         group by t.user_id ,t.`name` ,t.email,t.address,t.tel,t.create_time ,t.level_cd
         order by t.create_time desc
         <if test="page != -1 and page != null ">
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java
index 0c69f58..be3fef0 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ListSystemUsersCmd.java
@@ -72,6 +72,12 @@ public class ListSystemUsersCmd extends Cmd {
         // 设置用户ID查询条件
         userDto.setUserId(reqJson.getString("systemUserId"));
 
+        // 从请求头获取storeId，限制只查询当前商户下的用户
+        String storeId = context.getReqHeaders().get("store-id");
+        if (storeId != null && !storeId.isEmpty()) {
+            userDto.setStoreId(storeId);
+        }
+
         // 获取符合条件的系统用户总数
         int count = userV1InnerServiceSMO.getSystemUserCount(userDto);
 
--
libgit2 0.21.4