Skip to content

Commit 247c272

Browse files
towelongcolorful3
authored andcommitted
fix: #247
1 parent 04ba8b9 commit 247c272

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/main/java/io/github/talelin/latticy/mapper/UserGroupMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
public interface UserGroupMapper extends BaseMapper<UserGroupDO> {
1515

1616
int insertBatch(@Param("relations") List<UserGroupDO> relations);
17+
18+
int deleteByUserId(@Param("user_id") Integer userId);
1719
}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
import io.github.talelin.latticy.dto.admin.UpdateGroupDTO;
1616
import io.github.talelin.latticy.dto.admin.UpdateUserInfoDTO;
1717
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.*;
2320
import io.github.talelin.latticy.service.AdminService;
2421
import io.github.talelin.latticy.service.GroupService;
2522
import io.github.talelin.latticy.service.PermissionService;
@@ -58,6 +55,9 @@ public class AdminServiceImpl implements AdminService {
5855
@Autowired
5956
private GroupPermissionMapper groupPermissionMapper;
6057

58+
@Autowired
59+
private UserGroupMapper userGroupMapper;
60+
6161
@Override
6262
public IPage<UserDO> getUserPageByGroupId(Integer groupId, Integer count, Integer page) {
6363
Page<UserDO> pager = new Page<>(page, count);
@@ -90,7 +90,9 @@ public boolean deleteUser(Integer id) {
9090
boolean userRemoved = userService.removeById(id);
9191
QueryWrapper<UserIdentityDO> wrapper = new QueryWrapper<>();
9292
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;
9496
}
9597

9698
@Override

src/main/resources/mapper/UserGroupMapper.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@
1717
</foreach>
1818
</insert>
1919

20+
<delete id="deleteByUserId">
21+
DELETE FROM lin_user_group
22+
WHERE user_id = #{user_id}
23+
</delete>
24+
2025
</mapper>

0 commit comments

Comments
 (0)