From ee09967c6e6323cace41a258242c88cc47c2951c Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 26 八月 2021 13:14:12 +0800
Subject: [PATCH] 优化代码

---
 service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
index f81b1f9..2b3afa2 100755
--- a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
@@ -78,10 +78,17 @@
         HttpHeaders header = new HttpHeaders();
         IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
 
+        for (String key : headers.keySet()
+        ) {
+            header.add(key, headers.get(key));
+        }
+
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
         if (!StringUtil.isEmpty(result.getUserId())) {
             header.add("user-id", result.getUserId());
-            header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+            if (!StringUtil.isEmpty(result.getUserName())) {
+                header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+            }
         }
 
         header.add("store-id", result.getStoreId());
@@ -103,11 +110,6 @@
         }
 
 
-        for (String key : headers.keySet()
-        ) {
-            header.add(key, headers.get(key));
-        }
-
         HttpEntity<String> httpEntity = new HttpEntity<String>(body, header);
         logger.debug("璇锋眰鍚庣url" + url);
         ResponseEntity<String> responseEntity = null;
@@ -119,8 +121,8 @@
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             logger.debug("api杩斿洖淇℃伅" + responseEntity);
-            return responseEntity;
         }
+        return responseEntity;
     }
 
 

--
Gitblit v1.8.0