From 947fe3f7f0dbc8bb8b462e67a99128069ac7caf4 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 12 Feb 2020 17:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97sql=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=EF=BC=9B=E5=B1=85=E6=B0=91=E4=B8=8E=E5=85=9A=E5=91=98=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=8C=89=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml        |  1 +
 .../resources/mapper/user/UserAnalysisDao.xml    | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/logback-spring.xml
index 379473afc..e055a3b09 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/logback-spring.xml
@@ -134,6 +134,7 @@
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.elink.esua.epdc" level="INFO"/>
         <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <logger name="com.elink.esua.epdc.modules.user.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
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 33f0457df..2bb205484 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
@@ -33,10 +33,14 @@
                     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>
+                    <choose>
+                        <when test="gridId != null and gridId != ''">AND ad2.ID = #{gridId}</when>
+                        <otherwise>
+                            <if test="deptIdList != null and deptIdList.size() > 0">
+                                AND ad2.ID in <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
+                            </if>
+                        </otherwise>
+                    </choose>
                     /*待补充按时间筛选*/
                     AND ad.id IS NOT NULL
                 ) t
@@ -61,8 +65,8 @@
             uu.DEL_FLAG = '0'
             AND uu.PARTY_FLAG = '0'
             AND ad.id IS NOT NULL
-            <if test="deptIdList != null and deptIdList.size() > 0">
-                and ad2.ID  in
+            <if test="streetIdList != null and streetIdList.size() > 0">
+                and ad2.ID in
                 <foreach collection="streetIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
             </if>
         GROUP BY