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] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E7=94=A8=E6=88=B7=EF=BC=8C=E8=8C=83=E5=9B=B4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=92=8C=E5=85=B6=E4=BB=96=E7=BD=91=E6=A0=BC=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=9A=84=E5=8F=82=E4=B8=8E=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E8=B7=A8=E7=BD=91=E6=A0=BC=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=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>