From 5700f42a37a2f9ecc27161e2b0559a820d320f6b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 17 三月 2025 15:11:40 +0800
Subject: [PATCH] 开发完成同一个手机号登录不同物业公司的支持

---
 service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
index c51d701..df53624 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -92,18 +93,17 @@
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        if (!reqJson.containsKey("storeId")) {
-            String storeId = context.getReqHeaders().get("store-id");
-            reqJson.put("storeId", storeId);
-        }
+        String storeId = CmdContextUtils.getStoreId(context);
+        Assert.hasLength(storeId, "鐢ㄦ埛鏈櫥褰�");
+
         //鑾峰彇鏁版嵁涓婁笅鏂囧璞�
-        Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
         //鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
         UserDto userDto = new UserDto();
         userDto.setTel(reqJson.getString("tel"));
         userDto.setUserFlag("1");
         userDto.setLevelCd("01"); //鍛樺伐
-        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+        userDto.setStoreId(storeId);
+        List<UserDto> users = userInnerServiceSMOImpl.getStaffs(userDto);
         Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
     }
 

--
Gitblit v1.8.0