From 9f4ebcebf1ecd20a9b1b30124143013efb830bf4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 11 Aug 2022 14:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=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/IcEventDao.xml                  | 4 ++--
 .../src/main/resources/mapper/ProjectDao.xml                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 230a711e86..ec9ff0745f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/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>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 3340b6d104..73c2f11384 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/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>