From a1e59bd7b35340da56cd0191b855ff6dffa902ed Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 22 Nov 2022 11:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=8B=86?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-cloud-commons-shibei           |  2 +-
 .../main/resources/mapper/item/ItemDao.xml    | 22 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index 933362739..262b5b5d9 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit 9333627393ca5101c24221718ee54c603829c4c9
+Subproject commit 262b5b5d9d9ac7f82b303d431f197b2f414ea373
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 00f0bcfe2..4fa04433b 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
@@ -2185,19 +2185,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
+            and i.ITEM_STATE = #{itemState}
+        </if>
+        <if test="evaluationState != null and evaluationState != ''">
             <choose>
-                <when test="itemState == '80'">
+                <when test="evaluationState == '80'">
                     and i.EVALUATION_STATE = '1'
                     and i.EVALUATION_TIME IS NULL
                     and i.ITEM_STATE != '10'
                 </when >
-                <when test="itemState == '90'">
+                <when test="evaluationState == '90'">
                     and i.EVALUATION_TIME IS NOT NULL
-                    and i.ITEM_STATE != '10'
                 </when >
-                <otherwise>
-                    and i.ITEM_STATE = #{itemState}
-                </otherwise>
             </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">
@@ -2302,19 +2301,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
+            and i.ITEM_STATE = #{itemState}
+        </if>
+        <if test="evaluationState != null and evaluationState != ''">
             <choose>
-                <when test="itemState == '80'">
+                <when test="evaluationState == '80'">
                     and i.EVALUATION_STATE = '1'
                     and i.EVALUATION_TIME IS NULL
                     and i.ITEM_STATE != '10'
                 </when >
-                <when test="itemState == '90'">
+                <when test="evaluationState == '90'">
                     and i.EVALUATION_TIME IS NOT NULL
-                    and i.ITEM_STATE != '10'
                 </when >
-                <otherwise>
-                    and i.ITEM_STATE = #{itemState}
-                </otherwise>
             </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">