From 7f3e8e55545a4892cdea809e33e123b0c4fc5134 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 9 May 2023 15:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java    | 5 ++++-
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml     | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index aa5bc318..d8453541 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -122,7 +122,10 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     for (int i = 0; i < pageList.size(); i++) {
                         pageList.get(i).setSelect(false);
                         String taxno = pageList.get(i).getGfsh();
-                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
+//                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
+//                            pageList.get(i).setSelect(true);
+//                        }
+                        if ("0".equals(pageList.get(i).getRzzt())) {
                             pageList.get(i).setSelect(true);
                         }
                         String skssq = pageList.get(i).getSkssq();
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index f0f56862..c8a49731 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -126,10 +126,13 @@
         and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null'">
             and date_format(t.posting_time,'%Y-%m-%d') between #{postingTimeStart} and #{postingTimeEnd}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' ">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '3'">
             and t.rzh_yesorno = #{rzzt}
         </if>
-          <if test="imageId != null and imageId != '' and imageId != 'null' ">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt == '3'">
+            and (t.rzh_yesorno = '1' or t.rzh_yesorno = '2')
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' ">
             and t.image_id = #{imageId}
         </if>
         <if test="rzclzt !=null and rzclzt != ''">