From ae614d7516eb24ca0df468a0f6bb2ac3469df219 Mon Sep 17 00:00:00 2001 From: Odboy Date: Mon, 20 Oct 2025 17:20:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E5=85=B8=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=97=A0=E6=95=88=20by=20=E4=BC=9F=E5=A4=A7?= =?UTF-8?q?=E7=9A=84=E7=BE=A4=E6=9C=89liyubin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemDictDetailController.java | 2 +- .../dal/model/SystemQueryDictDetailArgs.java | 16 ++++++---------- .../system/service/SystemDictDetailService.java | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 197959b2..fdfeda17 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -52,7 +52,7 @@ public class SystemDictDetailController { @PostMapping(value = "/queryDictDetailByArgs") public ResponseEntity> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs args) { SystemQueryDictDetailArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); + Page page = new Page<>(args.getPage(), args.getSize()); return ResponseEntity.ok(systemDictDetailService.queryDictDetailByArgs(criteria, page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java index f2d5eaf3..e45fd8a4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java @@ -16,21 +16,17 @@ package cn.odboy.system.dal.model; +import cn.odboy.base.CsObject; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SystemQueryDictDetailArgs { +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter +public class SystemQueryDictDetailArgs extends CsObject { @ApiModelProperty(value = "标签") private String label; @ApiModelProperty(value = "字典名称") private String dictName; - - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; } \ No newline at end of file diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index 48b41b6d..ae4466e7 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -23,6 +23,7 @@ import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.util.CsPageUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;