From db7ac81a2eb4fe63d3eb22f1b6c4f955a97ee196 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 27 Oct 2022 17:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcEmployeeRegisterDao.xml   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 21be167f64..5bb4bb0533 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,7 +42,13 @@
             INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0
             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},'%')
+                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>
             ORDER BY rd.CREATED_TIME DESC
         )t
         where 1=1