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 { if (StringUtils.isEmpty(this.dikeCode)) { return AuthorityDikeCodeService.getAuthorityDikeCode(); } - return null; + return this.dikeCode; } @ApiModelProperty(value = "水闸编码") @@ -40,6 +40,6 @@ public class ApprovalSearchDto { 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; } }