From 1efc81fab5f08977949560f43abad0851b44bb9e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Jul 2021 12:55:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BCfact=5Fgrid=5Fgovern=5Fdaily=E6=8A=BD?=
 =?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/org/StatsCustomerAgencyDao.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index c0209242e6..f7fe07a1a8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -190,7 +190,6 @@
                 customer_department cd
             WHERE
                 cd.id = #{deptId}
-            AND cd.DEL_FLAG = '0'
             )
     </select>
 

From 034015f4f756314154c515b7e227e561fa20e930 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Jul 2021 15:11:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?>8000=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=BB=99=E7=94=A8=E6=88=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartyMemberConfirmServiceImpl.java           | 2 +-
 .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index fb8490ad0b..951d13bb86 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -583,7 +583,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
 			log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
 			if (!result.success()){
-				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg());
+				throw new RenException(result.getCode(),result.getMsg());
 			}
 		}else{
 			log.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 53befc262c..2c58fe7b65 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -310,8 +310,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			//更新该用户在该客户下的注册状态
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}else{
-			log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
-			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode());
+			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(),EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
 		}
 
 		return result;