From ebdc8226b8cae4a9a097178a0a63742b7e0dbc1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 25 Aug 2020 18:18:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/HttpContextUtils.java | 5 +++--
 .../java/com/epmet/filter/CpAuthGatewayFilterFactory.java    | 4 +++-
 .../java/com/epmet/service/impl/OperMenuServiceImpl.java     | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java
index 6a01fa6c0f..d27da23ab7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java
@@ -61,8 +61,9 @@ public class HttpContextUtils {
 		}
 
 		//请求语言
-		defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
-
+		if(StringUtils.isNotBlank(request.getHeader(HttpHeaders.ACCEPT_LANGUAGE))){
+			defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+		}
 		return defaultLanguage;
 	}
 }
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index 43fbf6d0cb..7c74fa6763 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -135,7 +135,9 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 						.header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
 						;
 				if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端
-					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+					if(StringUtils.isNotBlank(customerId)){
+						exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+					}
 				} else if (StringUtils.equals(baseTokenDto.getApp(), "public")) {//公众号端
 					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
 				}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
index 8c7354a086..df8c7fc154 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
@@ -166,7 +166,9 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
         List<OperMenuEntity> menuList;
 
         Result<OperUserDTO> operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId());
-
+        if(!operUserDTOResult.success()||null==operUserDTOResult.getData()){
+            return new ArrayList<>();
+        }
         //系统管理员，拥有最高权限
         if(operUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){
             menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage());