From bd2fea9870535fa5c446372c84d6cbfbbdeb5cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Fri, 21 Mar 2025 18:57:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/common/dto/ApprovalSearchDto.java     | 4 ++--
 .../java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java | 6 ------
 .../java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java    | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
index f91e22b9..1a02b4ed 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
@@ -30,7 +30,7 @@ public class ApprovalSearchDto<T> {
         if (StringUtils.isEmpty(this.dikeCode)) {
             return AuthorityDikeCodeService.getAuthorityDikeCode();
         }
-        return null;
+        return this.dikeCode;
     }
 
     @ApiModelProperty(value = "水闸编码")
@@ -40,6 +40,6 @@ public class ApprovalSearchDto<T> {
         if (StringUtils.isEmpty(this.wagaCode)) {
             return AuthorityDikeCodeService.getAuthorityDikeCode();
         }
-        return null;
+        return this.wagaCode;
     }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java
index 480d5713..5877dfa6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java
@@ -37,11 +37,5 @@ public class ObjectStatisticQueDto implements IAdcd {
     @ApiModelProperty(value = "结束时间", required = true)
     private Date endTime;
 
-    public String getCode() {
-        if (StringUtils.isEmpty(this.code)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
-        }
-        return null;
-    }
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
index 385744f2..7ebe8042 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
@@ -57,7 +57,7 @@ public class SzRecordSearchV2Dto {
         if (StringUtils.isEmpty(this.wagaCode)) {
             return AuthorityDikeCodeService.getAuthorityDikeCode();
         }
-        return null;
+        return this.wagaCode;
     }
 
 }