事件管理，项目管理修改

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -218,12 +218,12 @@
         <if test="status != null and status != '' ">
             AND ie.`status` = #{status}
         </if>
-        <if test="(firstIdList != null and firstIdList.size() > 0) or (secondIdList == null or secondIdList.size() == 0)"><!-- 一类查询条件 -->
+        <if test="(firstIdList != null and firstIdList.size() > 0) and (secondIdList == null or secondIdList.size() == 0)"><!-- 一类查询条件 -->
             <foreach collection="firstIdList" item="firstId" open="AND iec.CATEGORY_PIDS IN (" separator="," close=")">
                 #{firstId}
             </foreach>
         </if>
-        <if test="(secondIdList != null and secondIdList.size() > 0) or (firstIdList == null or firstIdList.size() == 0)"><!-- 二类查询条件 -->
+        <if test="(secondIdList != null and secondIdList.size() > 0) and (firstIdList == null or firstIdList.size() == 0)"><!-- 二类查询条件 -->
             <foreach collection="secondIdList" item="secondId" open="AND iec.CATEGORY_ID IN (" separator="," close=")">
                 #{secondId}
             </foreach>

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -673,12 +673,12 @@
             group by project_id
             ORDER BY created_time desc
         )pc ON p.id = pc.project_id
-        <if test="(firstIdList != null and firstIdList.size() > 0) or (secondIdList == null or secondIdList.size() == 0)"><!-- 一类查询条件 -->
+        <if test="(firstIdList != null and firstIdList.size() > 0) and (secondIdList == null or secondIdList.size() == 0)"><!-- 一类查询条件 -->
             <foreach collection="firstIdList" item="firstId" open="AND pc.category_pids IN (" separator="," close=")">
                 #{firstId}
             </foreach>
         </if>
-        <if test="(secondIdList != null and secondIdList.size() > 0) or (firstIdList == null or firstIdList.size() == 0)"><!-- 二类查询条件 -->
+        <if test="(secondIdList != null and secondIdList.size() > 0) and (firstIdList == null or firstIdList.size() == 0)"><!-- 二类查询条件 -->
             <foreach collection="secondIdList" item="secondId" open="AND pc.category_id IN (" separator="," close=")">
                 #{secondId}
             </foreach>