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 @@ - AND auth.auth_expire_date BETWEEN #{param.startAuthExpireDate} AND #{param.endAuthExpireDate} + AND auth.auth_expire_date >= #{param.startAuthExpireDate} + AND auth.auth_expire_date <= #{param.endAuthExpireDate} 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")