From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
index 0f15363..017b80c 100644
--- a/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/PrivilegeServiceSMOImpl.java
@@ -6,6 +6,9 @@
import com.java110.core.context.IPageData;
import com.java110.api.smo.IGetCommunityStoreInfoSMO;
import com.java110.api.smo.IPrivilegeServiceSMO;
+import com.java110.core.language.Language;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -219,9 +222,10 @@
String storeTypeCd = storeInfoObj.getString("storeTypeCd");
String pgId = privilegeInfoObj.getString("pgId");
String pName = privilegeInfoObj.getString("pName");
+ String communityId = privilegeInfoObj.getString("communityId");
ResponseEntity<String> privileges = super.callCenterService(restTemplate, pd, "",
- "query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName, HttpMethod.GET);
+ "query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName+"&communityId="+communityId, HttpMethod.GET);
if (privileges.getStatusCode() != HttpStatus.OK) {
return privileges;
@@ -239,6 +243,16 @@
privilegeObj = privilegeArrays.getJSONObject(privilegeIndex);
hasSameData(privilegeObj, tmpPrivilegeArrays);
}
+
+
+ Object lang = pd.getHeaders().get(CommonConstant.JAVA110_LANG);
+ if (!StringUtil.isNullOrNone(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
+ Language language = ApplicationContextFactory.getBean(lang.toString(), Language.class);
+ if (language != null) {
+ tmpPrivilegeArrays = language.getPrivilegeMenuDto(tmpPrivilegeArrays);
+ }
+
+ }
return new ResponseEntity<String>(tmpPrivilegeArrays.toJSONString(), HttpStatus.OK);
}
--
Gitblit v1.8.0