From 18f2c90ad1953da9b0ff91a9990b03c6d7e7e564 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 14 Dec 2023 10:26:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=AE=B0=E5=BD=95=E6=8E=88=E6=9D=83=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/EnterpriseStandardAuthUserMapper.xml           | 3 ++-
 .../laws/standard/controller/TempAuthRecordQueryDto.java      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
index 3fd84ec9..5573f6af 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
@@ -69,7 +69,8 @@
         </if>
         <!--授权到期日期-->
         <if test="param.startAuthExpireDate != null and param.endAuthExpireDate != ''">
-            AND auth.auth_expire_date BETWEEN #{param.startAuthExpireDate} AND #{param.endAuthExpireDate}
+            AND auth.auth_expire_date >= #{param.startAuthExpireDate}
+            AND auth.auth_expire_date &lt;= #{param.endAuthExpireDate}
         </if>
         <!--授权部门-->
         <if test="param.authDeptList != null and param.authDeptList.size() > 0">
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
index dfb4baa5..78501fc8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
@@ -42,13 +42,13 @@ public class TempAuthRecordQueryDto {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "授权到期日期开始时间")
-    private Date startAuthExpireDate;
+    private String startAuthExpireDate;
 
     /**授权到期日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "授权到期日期结束时间")
-    private Date endAuthExpireDate;
+    private String endAuthExpireDate;
 
     /**授权部门*/
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")