From 3daba90bf4dfe1286e35a635df5f0f5d4f45cb82 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 15 Oct 2020 18:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85?= =?UTF-8?q?=E5=86=B5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/user/UserAnalysisDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 6bb7acd6..20273120 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -160,13 +160,13 @@ SELECT user.DEPT_ID gridId, COUNT(user.ID) AS registerCount, - COUNT(user.PARTY_FLAG ='0' OR NULL) AS residentCount , + COUNT(user.PARTY_FLAG ='0' and user.state !='0' OR NULL) AS residentCount , COUNT(user.PARTY_FLAG ='1' OR NULL) AS partyCount FROM ( - select newuu.ID,newuu.DEPT_ID,newuu.PARTY_FLAG from ( + select newuu.ID,newuu.DEPT_ID,newuu.PARTY_FLAG,newuu.STATE from ( SELECT - DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,PARTY_FLAG,REGISTER_TIME, + DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,PARTY_FLAG,REGISTER_TIME,STATE, ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), ( SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' AND USER_ID = uu.ID