From 8954b31f190a8b9e799decca8386bfa989155345 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 25 Feb 2021 10:16:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0del=5Fflag=3D'0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AreaCodeChildDao.xml              | 2 +-
 .../src/main/resources/mapper/AreaCodeDao.xml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
index 422565051c..c918bb7702 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
@@ -5,7 +5,7 @@
 
 
     <select id="selectAllChild" resultType="com.epmet.dto.AreaCodeChildDTO">
-        select * from area_code_child
+        select * from area_code_child m where m.DEL_FLAG = '0'
     </select>
 
     <select id="selectByCode" resultType="com.epmet.dto.AreaCodeChildDTO">
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
index 6a57dcb2f7..d12886bdc7 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
@@ -5,7 +5,7 @@
 
 
     <select id="selectAllArea" resultType="com.epmet.dto.AreaCodeDTO">
-        select * from area_code
+        select * from area_code m where m.DEL_FLAG = '0'
     </select>
 
     <select id="selectByCountyCode" resultType="com.epmet.dto.AreaCodeDTO">

From d3fd2c3c208b0433d11483abe7e085789a4e0d82 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 25 Feb 2021 14:12:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E9=89=B4=E6=9D=83=E5=A4=84=E7=90=86=E5=99=A8=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3header=E4=B8=ADCustomerId=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/auth/InternalAuthProcessor.java | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
index bd7d740297..15406173b2 100644
--- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
+++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
@@ -111,17 +111,24 @@ public class InternalAuthProcessor extends AuthProcessor {
             builder.header(AppClientConstant.APP,baseTokenDto.getApp());
             builder.header(AppClientConstant.CLIENT,baseTokenDto.getClient());
             builder.header(AppClientConstant.USER_ID,baseTokenDto.getUserId());
-            if (StringUtils.isNotBlank(baseTokenDto.getCustomerId())) {
-                builder.header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
-            }
 
-            if (StringUtils.equalsAny(baseTokenDto.getApp(), AppClientConstant.APP_GOV, AppClientConstant.APP_RESI)) {//工作端/居民端
-                if(StringUtils.isNotBlank(customerId)){
-                    exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+            if(StringUtils.isNotBlank(customerId)){
+                if (StringUtils.equalsAny(baseTokenDto.getApp(), AppClientConstant.APP_GOV, AppClientConstant.APP_RESI, "public")) {//工作端/居民端
+                    builder.header(AppClientConstant.CUSTOMER_ID, customerId);
                 }
-            } else if (StringUtils.equals(baseTokenDto.getApp(), "public")) {//公众号端
-                exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
             }
+
+            //if (StringUtils.isNotBlank(baseTokenDto.getCustomerId())) {
+            //    builder.header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
+            //}
+            //
+            //if (StringUtils.equalsAny(baseTokenDto.getApp(), AppClientConstant.APP_GOV, AppClientConstant.APP_RESI)) {//工作端/居民端
+            //    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);
+            //}
             ServerHttpRequest build = exchange.getRequest().mutate().build();
             return exchange.mutate().request(build).build();
         }