From 1f6d89051c573a971f2f569361c3c22a240c76fd Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 16 Aug 2021 19:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B9=B3=E9=98=B4?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=EF=BC=9A?= =?UTF-8?q?=E4=B8=AD=E5=A4=AE=E5=8C=BA=E5=90=84=E7=B1=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B1=87=E6=80=BB=EF=BC=9A=E7=94=A8=E6=88=B7=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=85=9A=E5=91=98=E6=95=B0=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=201=E3=80=81=E7=94=A8=E6=88=B7=E6=80=BB?= =?UTF-8?q?=E6=95=B0=EF=BC=9A=E6=9C=AA=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=AE=97=E5=88=B0=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=89=AB=E7=A0=81=E7=BD=91=E6=A0=BC=E4=B8=8A=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=8E=BB=E9=99=A4=E9=94=A6=E6=B0=B4=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=202=E3=80=81=E5=85=9A=E5=91=98=E6=95=B0?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E9=99=A4=E9=94=A6=E6=B0=B4=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenPublicDataDao.xml | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 3c772457..3fccfd47 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -101,7 +101,16 @@ 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from (SELECT utmp.`ID`, + utmp.`PARTY_FLAG`, + utmp.`DEL_FLAG` , + CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID + FROM `esua_epdc_user`.`epdc_user` utmp + LEFT JOIN( + SELECT eugr.USER_ID, eugr.GRID_ID + FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr + WHERE eugr.DEL_FLAG= '0' + ORDER BY eugr.CREATED_TIME) gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -247,7 +256,16 @@ FROM esua_epdc_admin.sys_dept co 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from (SELECT utmp.`ID`, + utmp.`PARTY_FLAG`, + utmp.`DEL_FLAG` , + CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID + FROM `esua_epdc_user`.`epdc_user` utmp + LEFT JOIN( + SELECT eugr.USER_ID, eugr.GRID_ID + FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr + WHERE eugr.DEL_FLAG= '0' + ORDER BY eugr.CREATED_TIME) gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -395,8 +413,19 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu - where eu.DEL_FLAG=0 + from (SELECT utmp.`ID`, + utmp.`PARTY_FLAG`, + utmp.`DEL_FLAG` , + CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID + FROM `esua_epdc_user`.`epdc_user` utmp + LEFT JOIN( + SELECT eugr.USER_ID, eugr.GRID_ID + FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr + WHERE eugr.DEL_FLAG= '0' + ORDER BY eugr.CREATED_TIME) gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu + where eu.DEL_FLAG=0 AND eu.DEPT_ID NOT IN( SELECT t.`dept_id` + FROM `esua_epdc_admin`.`sys_dept_config` t + WHERE t.`del_flag`= 0) group by eu.DEPT_ID UNION all SELECT