Skip to content

Feat/group ids required #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
colorful3 merged 8 commits into from
Jul 16, 2020
Merged

Feat/group ids required #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b288365
Merge pull request #34 from TaleLin/dev
colorful3 May 1, 2020
89ffc97
refactor(Page): 重构 Page 分页对象
juzi214032 May 3, 2020
e29eff2
refactor(UserPermissionVO): 为 UserPermissionVO 的 permissions 属性指定泛型
juzi214032 May 4, 2020
b7e453d
refactor(Page): 将 Page 分页对象泛型参数列表补充完整
juzi214032 May 6, 2020
fc9b169
chore(pom): 为 Maven 指定 file.encoding 参数，解决运行 mvn test 报错问题
juzi214032 May 7, 2020
573e6aa
fix(Page): 修复分页问题
juzi214032 May 7, 2020
41dbdc7
merge: 解决合并冲突
colorful3 Jul 15, 2020
b4e856c
feat: 新增更新用户信息接口对于 group_ids 字段的校验
colorful3 Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/io/github/talelin/latticy/dto/admin/UpdateUserInfoDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import java.util.List;

/**
Expand All @@ -12,5 +13,7 @@
@Data
public class UpdateUserInfoDTO {

@NotEmpty(message = "{group.ids.not-empty}")
private List<@Min(1) Integer> groupIds;

}
3 changes: 0 additions & 3 deletions src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ public boolean deleteUser(Integer id) {
@Override
public boolean updateUserInfo(Integer id, UpdateUserInfoDTO validator) {
List<Integer> 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) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/ValidationMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down