From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +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 |    9 +++++----
 1 files changed, 5 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 354ceae..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
@@ -86,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