From 28220074b437770561feb98c2a7af4590f80483e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 27 Oct 2022 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?checkStatus=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/IcEmployeeRegisterDao.xml  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml
index 4d0404334d..dbda4a3d7b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml
@@ -42,11 +42,13 @@
             left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0
             WHERE ie.DEL_FLAG = 0
               AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
-            <if test='null != natStartDate and natStartDate != ""'>
-                AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate}
-            </if>
-            <if test='null != natEndDate and natEndDate != ""'>
-                AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natEndDate}
+            <if test='null == checkStatus or checkStatus == ""'>
+                <if test='null != natStartDate and natStartDate != ""'>
+                    AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate}
+                </if>
+                <if test='null != natEndDate and natEndDate != ""'>
+                    AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natEndDate}
+                </if>
             </if>
             ORDER BY rd.CREATED_TIME DESC
         )t