diff --git a/src/main/java/io/github/talelin/latticy/dto/admin/UpdateUserInfoDTO.java b/src/main/java/io/github/talelin/latticy/dto/admin/UpdateUserInfoDTO.java index 655d00d6..722f404b 100644 --- a/src/main/java/io/github/talelin/latticy/dto/admin/UpdateUserInfoDTO.java +++ b/src/main/java/io/github/talelin/latticy/dto/admin/UpdateUserInfoDTO.java @@ -3,6 +3,7 @@ import lombok.Data; import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -12,5 +13,7 @@ @Data public class UpdateUserInfoDTO { + @NotEmpty(message = "{group.ids.not-empty}") private List<@Min(1) Integer> groupIds; + } diff --git a/src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java b/src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java index a6aafb04..ddc2b1d7 100644 --- a/src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java +++ b/src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java @@ -93,9 +93,6 @@ public boolean deleteUser(Integer id) { @Override public boolean updateUserInfo(Integer id, UpdateUserInfoDTO validator) { List newGroupIds = validator.getGroupIds(); - if (newGroupIds == null || newGroupIds.isEmpty()) { - return false; - } Integer rootGroupId = groupService.getParticularGroupIdByLevel(GroupLevelEnum.ROOT); boolean anyMatch = newGroupIds.stream().anyMatch(it -> it.equals(rootGroupId)); if (anyMatch) { diff --git a/src/main/resources/ValidationMessages.properties b/src/main/resources/ValidationMessages.properties index 77c4aee8..7d8750ff 100644 --- a/src/main/resources/ValidationMessages.properties +++ b/src/main/resources/ValidationMessages.properties @@ -7,6 +7,7 @@ page.number.min=\u5206\u9875\u9875\u7801\u5FC5\u987B\u4E3A\u6B63\u6574\u6570 group.id.positive=\u5206\u7EC4id\u5FC5\u987B\u4E3A\u6B63\u6574\u6570 group.id.not-null=\u5206\u7EC4id\u4E0D\u53EF\u4E3A\u7A7A group.ids.long-list=\u5206\u7EC4id\u6BCF\u4E00\u9879\u5FC5\u987B\u4E3A\u6B63\u6574\u6570 +group.ids.not-empty=\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u5206\u7EC4 group.name.not-blank=\u8BF7\u8F93\u5165\u5206\u7EC4\u540D\u79F0 group.name.length=\u5206\u7EC4\u540D\u79F0\u4E0D\u53EF\u8D85\u8FC760\u5B57\u7B26 group.info.length=\u5206\u7EC4\u63CF\u8FF0\u4E0D\u53EF\u8D85\u8FC7255\u5B57\u7B26