From bb8c33129097eb5a189356aa34c48ac5986fd699 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 24 八月 2020 08:58:10 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
index cf05d72..1f0798d 100644
--- a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
@@ -295,7 +295,7 @@
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
+ //Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
@@ -322,7 +322,11 @@
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+ //Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+
+ if (!privilegeInfoObj.containsKey("staffId")) {
+ privilegeInfoObj.put("staffId", pd.getUserId());
+ }
ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
--
Gitblit v1.8.0