Merge branch 'feature/shenyan_shangbao' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/shenyan_shangbao

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

@@ -1094,6 +1094,14 @@
         WHERE item.DEL_FLAG = '0'
         and item.IS_PEOPLE = '1'
         and item.IS_DIFFICULTY = '1'
+        <choose>
+            <when test="listType != null and listType != '' and listType == '1'.toString()">
+                and item.IS_DIFFICULTY = '1'
+            </when>
+            <otherwise>
+                and item.IS_TYPICAL = '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}