From 1add76f573102697c7aadcbdf3da206a2d9b1aaf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Dec 2020 10:55:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E5=85=A5=E7=BB=84=E5=92=8C=E6=89=AB=E7=A0=81=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invitation/service/impl/GroupInvitationServiceImpl.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/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 00e6f25c48..39ab49fd00 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -386,7 +386,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过邀请链接入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
@@ -480,7 +480,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过扫码入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		//2020.11.17 sun 新增扫描或邀请进组是否需要审核的逻辑  start

From 5aa92157d452ea4d47f3f36b6881b87c6f052fb5 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 16 Dec 2020 11:18:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E7=94=A8=E6=88=B7=EF=BC=8C=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E5=85=B6=E4=BB=96=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E5=8F=82=E4=B8=8E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E9=99=A4=E8=B7=A8=E7=BD=91=E6=A0=BC=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/UserDao.xml    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index a441145bb4..810a972262 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -17,7 +17,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
@@ -52,7 +55,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
@@ -91,7 +97,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
@@ -131,7 +140,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
@@ -299,7 +311,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
@@ -332,7 +347,10 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>