From 6ab7c7f7c135edf2253d70e2cdceaa8a32334adf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 17 Jun 2021 15:37:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/impl/NoticeReadRecordServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
index 51684f9648..f7c93c7f0f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
@@ -166,13 +166,13 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
         } else {
             //4.根据是否过期判断已存在记录且是已读状态不在修改
             if (bl) {
-                if ("un_read".equals(entity.getReadFlag()) && null != entity) {
+                if (null != entity && "un_read".equals(entity.getReadFlag())) {
                     entity.setReadFlag(ReadFlagConstant.READ);
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }
             } else {
-                if ("un_read".equals(entity.getViewDetail()) && null != entity) {
+                if (null != entity && "un_read".equals(entity.getViewDetail())) {
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }

From 8b5f2d14a5420fcb8a54e4f71c1d38b1b22c6d9b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 17 Jun 2021 16:02:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TraceID(Transaction-Seria?=
 =?UTF-8?q?l)=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=A6=82=E6=9E=9Cnginx?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=94=9F=E6=88=90=E4=BA=86=E8=AF=A5header?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E7=9B=B4=E6=8E=A5=E7=94=A8nginx=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/filter/CpAuthGatewayFilterFactory.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 9e6d7ef077..c9a19fa8b8 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -13,6 +13,7 @@ import com.epmet.constant.TokenHeaderKeyConstant;
 import com.epmet.openapi.constant.AuthTypes;
 import com.epmet.openapi.constant.RequestParamKeys;
 import com.epmet.utils.ServerHttpRequestUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,9 +68,11 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 			}
 
 			//添加流水号
-			exchange.getRequest().mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
-
 			ServerHttpRequest request = exchange.getRequest();
+			List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
+			if (CollectionUtils.isEmpty(tranSerials) || StringUtils.isBlank(tranSerials.get(0))) {
+				request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
+			}
 
 			String authType = getAuthType(request);
 			String requestUri = request.getPath().pathWithinApplication().value();