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) != '其他' + + + AND item.PEOPLE_FLAG = #{peopleFlag} + + + AND item.PEOPLE_FLAG = #{peopleFlag} + and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' + + AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -2808,9 +2816,6 @@ AND find_in_set(#{deptId},item.ALL_DEPT_IDS) - - AND item.PEOPLE_FLAG = #{peopleFlag} - and item.EVALUATION_SCORE is not null group by item.EVALUATION_SCORE ORDER BY count(item.ID) desc