From 20f476c2d48d5c8fb7dad311dde63f05dcb55b95 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 12 Feb 2020 09:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserAnalysisServiceImpl.java  | 18 ++++++++++--------
 .../resources/mapper/user/UserAnalysisDao.xml  | 13 ++++++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index 6c98dc491..821a43b85 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -18,6 +18,7 @@ import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -59,7 +60,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         List<GridOpeningResultDTO> communityTopicCountList = baseDao.selectListCommunityTopicCount();
         GridOpeningResultDTO openingResultDto;
         for (int i = 0; i < registerCountList.size(); i++) {
-            openingResultDto=registerCountList.get(i);
+            openingResultDto = registerCountList.get(i);
             openingResultDto.setRegisterCount(registerCountList.get(i).getRegisterCount());
             openingResultDto.setPartyCount(partyCountList.get(i).getPartyCount());
             openingResultDto.setNewsCount(newsCountList.get(i).getNewsCount());
@@ -87,7 +88,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
 
         String partyFlag = MapUtil.getStr(params, "partyFlag");
         // 如果是查询党员相关排行，进行查询党员认证失败数的查询
-        if (YesOrNoEnum.YES.value().equals(partyFlag)) {
+        if (StringUtils.isNotBlank(partyFlag) && YesOrNoEnum.YES.value().equals(partyFlag)) {
             list = packPartyAuthFailureAmount(list);
         }
         return new PageData<>(list, page.getTotal());
@@ -107,13 +108,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             for (UserDataRankResultDTO rankResult : hasList) {
                 streetIdList.add(rankResult.getStreetId());
             }
+            if (CollUtil.isNotEmpty(streetIdList)) {
+                List<UserDataRankResultDTO> partyAuthFailureCountByStreetId = baseDao.selectListPartyAuthFailureCountByStreetId(streetIdList);
 
-            List<UserDataRankResultDTO> partyAuthFailureCountByStreetId = baseDao.selectListPartyAuthFailureCountByStreetId(streetIdList);
-
-            for (UserDataRankResultDTO rankResult : hasList) {
-                for (UserDataRankResultDTO byStreetId : partyAuthFailureCountByStreetId) {
-                    if (rankResult.getStreetId().equals(byStreetId.getStreetId())) {
-                        rankResult.setPartyAuthFailureCount(byStreetId.getPartyAuthFailureCount());
+                for (UserDataRankResultDTO rankResult : hasList) {
+                    for (UserDataRankResultDTO byStreetId : partyAuthFailureCountByStreetId) {
+                        if (rankResult.getStreetId().equals(byStreetId.getStreetId())) {
+                            rankResult.setPartyAuthFailureCount(byStreetId.getPartyAuthFailureCount());
+                        }
                     }
                 }
             }
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 47d903711..fce6f69f1 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
@@ -59,12 +59,16 @@
                     LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
                     WHERE uu.DEL_FLAG = '0'
                     <if test='partyFlag != null and partyFlag = "1"'>AND uu.PARTY_FLAG = '1'</if>
-                    /*待补充部门数据权限；待补充按时间筛选*/
+                    <if test="deptIdList != null and deptIdList.size() > 0">
+                        and ad2.ID  in
+                        <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
+                    </if>
+                    /*待补充按时间筛选*/
                     AND ad.id IS NOT NULL
                 ) t
             GROUP BY t.streetId
             ) t1
-            /*待补充排序功能*/
+            /*待补充排序功能 order by t1.oldCount asc */
     </select>
     
     <select id="selectListPartyAuthFailureCountByStreetId"
@@ -83,7 +87,10 @@
             uu.DEL_FLAG = '0'
             AND uu.PARTY_FLAG = '0'
             AND ad.id IS NOT NULL
-            /*待补充，and ad2.id in ()*/
+            <if test="deptIdList != null and deptIdList.size() > 0">
+                and ad2.ID  in
+                <foreach collection="streetIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
+            </if>
         GROUP BY
             ad2.ID
     </select>