From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug

---
 service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
index b6307aa..c938155 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
@@ -45,16 +45,29 @@
 
         Environment.isDevEnv();
 
+        if(reqJson.containsKey("storeId") && StoreDto.STORE_ADMIN.equals(reqJson.getString("storeId"))){
+            return ;
+        }
+
         if (!reqJson.containsKey("staffId")) {
             reqJson.put("staffId", reqJson.getString("userId"));
         }
 
         Assert.jsonObjectHaveKey(reqJson, "staffId", "璇锋眰鍙傛暟涓湭鍖呭惈staffId 鑺傜偣锛岃纭");
 
+        StoreUserDto storeUserDt = new StoreUserDto();
+        storeUserDt.setUserId(reqJson.getString("userId"));
+        List<StoreUserDto> storeUserDts = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDt);
+        Assert.listOnlyOne(storeUserDts, "鏌ヨ鍛樺伐鍟嗘埛閿欒锛�");
+
         //棣栧厛鍒ゆ柇鏄惁涓� 杩愯惀鎴栬�呭紑鍙�
         //鏌ヨstore 淇℃伅
         StoreDto storeDto = new StoreDto();
-        storeDto.setStoreId(reqJson.getString("storeId"));
+        if (!reqJson.containsKey("storeId")) {
+            storeDto.setStoreId(storeUserDts.get(0).getStoreId());
+        } else {
+            storeDto.setStoreId(reqJson.getString("storeId"));
+        }
         List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
 
         Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");

--
Gitblit v1.8.0