diff --git a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java index 201efa6..d9d9d8e 100644 --- a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java +++ b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java @@ -69,4 +69,11 @@ public class PageParam implements Serializable { } } + public void setOrderByColumn(String orderByColumn) { + if (!StringUtils.hasText(orderByColumn)) { + this.orderByColumn = "id"; + return; + } + + } } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java index 653937e..43e5c3b 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java @@ -28,4 +28,6 @@ public class RolePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "业务线", example = "yl") + private String busiLine; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleRespVO.java index 51af423..4407f37 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleRespVO.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.system.controller.admin.permission.vo.role; +import com.mzt.logapi.starter.annotation.DiffLogField; import com.zteits.urbanops.framework.excel.core.annotations.DictFormat; import com.zteits.urbanops.framework.excel.core.convert.DictConvert; import com.zteits.urbanops.module.system.enums.DictTypeConstants; @@ -7,6 +8,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.Data; import java.time.LocalDateTime; @@ -56,4 +58,6 @@ public class RoleRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式") private LocalDateTime createTime; + @Schema(description = "业务线", example = "yl") + private String busiLine; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java index 541aaa8..34edbc2 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java @@ -44,4 +44,8 @@ public class RoleSaveReqVO { @DiffLogField(name = "备注") private String remark; + @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") + @DiffLogField(name = "业务线") + //@NotNull(message = "业务线不能为空") + private String busiLine; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java index a26019c..f2fdc6e 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -38,4 +38,7 @@ public class UserPageReqVO extends PageParam { @Schema(description = "角色编号", example = "1024") private Long roleId; + @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") + private String busiLine; + } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java index 1a65862..6829bd9 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.system.controller.admin.user.vo.user; +import com.mzt.logapi.starter.annotation.DiffLogField; import com.zteits.urbanops.framework.excel.core.annotations.DictFormat; import com.zteits.urbanops.framework.excel.core.convert.DictConvert; import com.zteits.urbanops.module.system.enums.DictTypeConstants; @@ -71,5 +72,6 @@ public class UserRespVO{ @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式") private LocalDateTime createTime; - + @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") + private String busiLine; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 2805b36..3182872 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -76,5 +76,8 @@ public class UserSaveReqVO { return id != null // 修改时,不需要传递 || (ObjectUtil.isAllNotEmpty(password)); // 新增时,必须都传递 password } - + @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") + @DiffLogField(name = "业务线") + //@NotNull(message = "业务线不能为空") + private String busiLine; }