diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java index 05b951d7..cbf6a04a 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java @@ -40,8 +40,8 @@ public interface DataPermissionMapper extends BaseMapper { * @param queryWrapper 实体对象封装操作类(可以为 null) * @return 全部记录 */ - @Override @DataPermission + @Override List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** @@ -51,7 +51,18 @@ public interface DataPermissionMapper extends BaseMapper { * @param queryWrapper 实体对象封装操作类(可以为 null) * @return 全部记录(并翻页) */ - @Override @DataPermission + @Override List selectList(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据 ID 删除 + * + * @param obj 主键ID或实体 + * @param useFill 是否填充 + * @return 删除个数 + */ + @DataPermission + @Override + int deleteById(Object obj, boolean useFill); } diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 33a52e0b..8fe54647 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -203,6 +203,9 @@ public class UserServiceImpl extends BaseServiceImpl idList = list.stream().map(UserDO::getId).toList(); + Collection subtractIds = CollUtil.subtract(ids, idList); + CheckUtils.throwIfNotEmpty(subtractIds, "所选用户 [{}] 不存在", CollUtil.join(subtractIds, StringConstants.COMMA)); Optional isSystemData = list.stream().filter(UserDO::getIsSystem).findFirst(); CheckUtils.throwIf(isSystemData::isPresent, "所选用户 [{}] 是系统内置用户,不允许删除", isSystemData.orElseGet(UserDO::new) .getNickname()); @@ -392,7 +395,7 @@ public class UserServiceImpl extends BaseServiceImpl