From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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..b824466 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,11 +86,12 @@
 
 
         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());
+            headers.put("login-user-id",result.getLoginUserId());
             if (!StringUtil.isEmpty(result.getUserName())) {
                 headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
             }

--
Gitblit v1.8.0