|
15 | 15 | import io.github.talelin.latticy.dto.admin.UpdateGroupDTO; |
16 | 16 | import io.github.talelin.latticy.dto.admin.UpdateUserInfoDTO; |
17 | 17 | import io.github.talelin.latticy.mapper.GroupPermissionMapper; |
18 | | -import io.github.talelin.latticy.model.GroupDO; |
19 | | -import io.github.talelin.latticy.model.GroupPermissionDO; |
20 | | -import io.github.talelin.latticy.model.PermissionDO; |
21 | | -import io.github.talelin.latticy.model.UserDO; |
22 | | -import io.github.talelin.latticy.model.UserIdentityDO; |
| 18 | +import io.github.talelin.latticy.mapper.UserGroupMapper; |
| 19 | +import io.github.talelin.latticy.model.*; |
23 | 20 | import io.github.talelin.latticy.service.AdminService; |
24 | 21 | import io.github.talelin.latticy.service.GroupService; |
25 | 22 | import io.github.talelin.latticy.service.PermissionService; |
@@ -58,6 +55,9 @@ public class AdminServiceImpl implements AdminService { |
58 | 55 | @Autowired |
59 | 56 | private GroupPermissionMapper groupPermissionMapper; |
60 | 57 |
|
| 58 | + @Autowired |
| 59 | + private UserGroupMapper userGroupMapper; |
| 60 | + |
61 | 61 | @Override |
62 | 62 | public IPage<UserDO> getUserPageByGroupId(Integer groupId, Integer count, Integer page) { |
63 | 63 | Page<UserDO> pager = new Page<>(page, count); |
@@ -90,7 +90,9 @@ public boolean deleteUser(Integer id) { |
90 | 90 | boolean userRemoved = userService.removeById(id); |
91 | 91 | QueryWrapper<UserIdentityDO> wrapper = new QueryWrapper<>(); |
92 | 92 | wrapper.lambda().eq(UserIdentityDO::getUserId, id); |
93 | | - return userRemoved && userIdentityService.remove(wrapper); |
| 93 | + // 删除用户,还应当将 user_group表中的数据删除 |
| 94 | + boolean deleteResult = userGroupMapper.deleteByUserId(id) > 0; |
| 95 | + return userRemoved && userIdentityService.remove(wrapper) && deleteResult; |
94 | 96 | } |
95 | 97 |
|
96 | 98 | @Override |
|
0 commit comments