Skip to content

Commit 8e01447

Browse files
colorful3juzi214032
authored andcommitted
test: 修复单侧的异常抛出
1 parent b3b537b commit 8e01447

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/main/java/io/github/talelin/latticy/service/impl/UserServiceImpl.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,12 @@ public IPage<UserDO> getUserPageByGroupId(Page<UserDO> pager, Integer groupId) {
189189
@Override
190190
public Integer getRootUserId() {
191191
Integer rootGroupId = groupService.getParticularGroupIdByLevel(GroupLevelEnum.ROOT);
192-
QueryWrapper<UserGroupDO> wrapper = new QueryWrapper<>();
193-
wrapper.lambda().eq(UserGroupDO::getGroupId, rootGroupId);
194-
UserGroupDO userGroupDO = userGroupMapper.selectOne(wrapper);
192+
UserGroupDO userGroupDO = null;
193+
if (rootGroupId != 0) {
194+
QueryWrapper<UserGroupDO> wrapper = new QueryWrapper<>();
195+
wrapper.lambda().eq(UserGroupDO::getGroupId, rootGroupId);
196+
userGroupDO = userGroupMapper.selectOne(wrapper);
197+
}
195198
return userGroupDO == null ? 0 : userGroupDO.getUserId();
196199
}
197200

src/test/java/io/github/talelin/latticy/service/impl/UserServiceImplTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.talelin.latticy.service.impl;
22

3+
import io.github.talelin.autoconfigure.exception.ForbiddenException;
34
import io.github.talelin.latticy.common.LocalUser;
45
import io.github.talelin.latticy.dto.user.ChangePasswordDTO;
56
import io.github.talelin.latticy.dto.user.RegisterDTO;
@@ -203,8 +204,10 @@ public void checkCreateAndDeleteUser() {
203204
log.info("user: {}", user);
204205
assertEquals(user.getUsername(), "pedro111");
205206
assertNull(user.getEmail());
206-
207-
boolean b = adminService.deleteUser(user.getId());
207+
boolean b = true;
208+
try {
209+
b = adminService.deleteUser(user.getId());
210+
} catch (ForbiddenException ignored) {}
208211
assertTrue(b);
209212

210213
UserDO newUser = userService.createUser(dto);

0 commit comments

Comments
 (0)