From 487df5d0e8615c2eb50ad219c9541c1ed7fd74b9 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 31 Oct 2022 10:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A5=BC=E5=9B=BE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/item/ItemDao.xml      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 5950e43aa..7b7cb1e52 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/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
-        and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
+        <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