diff --git a/backend/src/main/java/com/example/erp/module/usr/dto/UserUpdateReqDTO.java b/backend/src/main/java/com/example/erp/module/usr/dto/UserUpdateReqDTO.java index 57fd866..27783c3 100644 --- a/backend/src/main/java/com/example/erp/module/usr/dto/UserUpdateReqDTO.java +++ b/backend/src/main/java/com/example/erp/module/usr/dto/UserUpdateReqDTO.java @@ -1,5 +1,8 @@ package com.example.erp.module.usr.dto; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Getter; import lombok.Setter; @@ -9,10 +12,16 @@ import java.util.List; @Setter public class UserUpdateReqDTO { + @NotBlank(message = "用户类型不能为空") + @Pattern(regexp = "普通用户|超级管理员", message = "用户类型无效") private String userType; + + @NotBlank(message = "语言不能为空") + @Pattern(regexp = "中文|英文|繁体", message = "语言无效") private String language; private boolean canEditDoc; private boolean isDisabled; private String employeeId; + @NotNull(message = "权限组列表不能为空") private List permGroupIds; } diff --git a/backend/src/main/java/com/example/erp/module/usr/vo/UserListItemVO.java b/backend/src/main/java/com/example/erp/module/usr/vo/UserListItemVO.java index 28678b7..dfba429 100644 --- a/backend/src/main/java/com/example/erp/module/usr/vo/UserListItemVO.java +++ b/backend/src/main/java/com/example/erp/module/usr/vo/UserListItemVO.java @@ -25,6 +25,9 @@ public class UserListItemVO { @JsonProperty("sLanguage") private String sLanguage; + @JsonProperty("bCanEditDoc") + private Integer bCanEditDoc; + @JsonProperty("bIsDisabled") private Integer bIsDisabled; diff --git a/backend/src/main/resources/mapper/UsrUserMapper.xml b/backend/src/main/resources/mapper/UsrUserMapper.xml index 661a7d4..a6ec4e9 100644 --- a/backend/src/main/resources/mapper/UsrUserMapper.xml +++ b/backend/src/main/resources/mapper/UsrUserMapper.xml @@ -6,7 +6,7 @@