From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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
old mode 100644
new mode 100755
index f37f41f..7f6261a
--- 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
@@ -344,11 +344,11 @@
String storeId = storeInfoObj.getString("storeId");
privilegeInfoObj.put("storeId", storeId);
-// ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
-// ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
+ ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
- ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
- ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
+// ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
+// ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
return privilegeGroup;
}
--
Gitblit v1.8.0