日志sql打印；居民与党员排行按部门筛选

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"/>

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