From 9dfdfeb01e717d8a6b98efb78cd9ee0aea333a8d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 26 七月 2022 18:36:22 +0800
Subject: [PATCH] 优化 代码

---
 service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 def8ed2..8a13fb0 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
@@ -59,9 +59,13 @@
 
     @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);
+        }
         //鑾峰彇鏁版嵁涓婁笅鏂囧璞�
         Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
-        Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "璇锋眰鍙傛暟涓湭鍖呭惈storeTypeCd 鑺傜偣锛岃纭");
         //鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
         UserDto userDto = new UserDto();
         userDto.setTel(reqJson.getString("tel"));
@@ -189,7 +193,7 @@
     public void addStaffOrg(JSONObject paramInJson) {
 
         JSONObject businessOrgStaffRel = new JSONObject();
-        businessOrgStaffRel.put("relId", "-1");
+        businessOrgStaffRel.put("relId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
         businessOrgStaffRel.put("storeId", paramInJson.getString("storeId"));
         businessOrgStaffRel.put("staffId", paramInJson.getString("userId"));
         businessOrgStaffRel.put("orgId", paramInJson.getString("orgId"));

--
Gitblit v1.8.0