From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
index aa13177..beb9457 100644
--- a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
@@ -5,6 +5,7 @@
import com.java110.api.smo.IApiServiceSMO;
import com.java110.api.smo.api.IApiSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.store.StoreDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -63,6 +64,11 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ //寮�鍙戣�呭拰杩愯惀涓嶆牎楠屽皬鍖�
+ if(StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd) || StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)){
+ return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
+ }
+
String communityId = "";
if (paramIn != null && paramIn.containsKey("communityId")
&& !StringUtil.isEmpty(paramIn.getString("communityId"))
@@ -80,14 +86,15 @@
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
- if (!StringUtil.isEmpty(result.getUserId())) {
+ if (!StringUtil.isEmpty(result.getLoginUserId())) {
headers.remove("user-id");
headers.remove("user_id");
headers.put("user-id", result.getUserId());
headers.put("user_id", result.getUserId());
- if (!StringUtil.isEmpty(result.getUserName())) {
- headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
- }
+ headers.put("login-user-id",result.getLoginUserId());
+// if (!StringUtil.isEmpty(result.getUserName())) {
+// headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+// }
}
if (!StringUtil.isEmpty(result.getStoreId())) {
--
Gitblit v1.8.0