From c9414e51caa14ad693c0b6f909e3c5c347a3a066 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 05 八月 2024 17:07:37 +0800 Subject: [PATCH] 完善代码. --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java index ffd3300..7bfbf5e 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java @@ -1,7 +1,7 @@ package com.dy.common.webUtil; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.*; @Data @@ -14,14 +14,35 @@ * 褰撳墠鏌ヨ椤� */ @Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null - public Integer pageCurr ; + @NotNull(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null + public Integer pageCurr; /** * 姣忛〉鏁版嵁鏉℃暟 */ @Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null - public Integer pageSize ; + @NotNull(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null + public Integer pageSize; + /** + * 璁剧疆褰撳墠榛樿绗竴椤� + * @return + */ + public Integer getPageCurr() { + if (pageCurr == null){ + return 1; + } + return pageCurr; + } + + /** + * 璁剧疆褰撳墠榛樿涓�椤靛崄鏉� + * @return + */ + public Integer getPageSize() { + if (pageSize == null){ + return 10; + } + return pageSize; + } } -- Gitblit v1.8.0