From d16de7541eefe28e2efb38dd53915d0757f55d04 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 2 Jun 2022 09:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcHouseDao.xml       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 54a455eac0..e907804e12 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -122,6 +122,7 @@
         LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and d.DEL_FLAG = '0'
         <where>
              1 = 1
+            and a.del_flag = '0'
             <if test="pids != null and pids != ''">
             and case c.AGENCY_PIDS when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
                     else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') end
@@ -171,13 +172,16 @@
             <if test="remark != null and remark.trim() != ''">
                 AND a.REMARK like CONCAT('%',#{remark},'%')
             </if>
-            <if test="null != updateStartDate and updateStartDate != '' ">
-                AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d')) >= #{updateStartDate} OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) >= #{updateStartDate})
+            <if test="null != updateStartDate and updateStartDate != '' and null != updateEndDate and updateEndDate != ''">
+                AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') >= #{updateStartDate} AND DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') <![CDATA[<=]]> #{updateEndDate})
+                OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d') >= #{updateStartDate} AND DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d') <![CDATA[<=]]> #{updateEndDate}))
             </if>
-            <if test="null != updateEndDate and updateEndDate != '' ">
-                AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d')) <![CDATA[<=]]> #{updateEndDate} OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) <![CDATA[<=]]> #{updateEndDate})
+            <if test="null != updateEndDate and updateEndDate != '' and (updateStartDate == null or updateStartDate == '') ">
+                AND (DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') <![CDATA[<=]]> #{updateEndDate}) OR ((DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) <![CDATA[<=]]> #{updateEndDate})
+            </if>
+            <if test="null != updateStartDate and updateStartDate != '' and (updateEndDate == null or updateEndDate == '') ">
+                AND (DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') <![CDATA[>=]]> #{updateStartDate}) OR ((DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) <![CDATA[>=]]> #{updateStartDate})
             </if>
-           and a.del_flag = '0'
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
         ORDER BY