大屏饼图筛选条件修改

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -2796,7 +2796,15 @@
         and item.IS_PEOPLE = '1'
         and item.EVENT_ID is null
         and item.ISSUE_ID is null
+        <choose>
+            <when test="peopleFlag != null and peopleFlag != '' and peopleFlag != '0'">
+                AND item.PEOPLE_FLAG = #{peopleFlag}
+            </when>
+            <otherwise>
+                AND item.PEOPLE_FLAG = #{peopleFlag}
                 and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
+            </otherwise>
+        </choose>
         <choose>
             <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
@@ -2808,9 +2816,6 @@
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
         </if>
-        <if test="peopleFlag != null and peopleFlag != ''">
-            AND item.PEOPLE_FLAG = #{peopleFlag}
-        </if>
         and item.EVALUATION_SCORE is not null
         group by item.EVALUATION_SCORE
         ORDER BY count(item.ID) desc