diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index d41d3ac6..2b16bec2 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -177,6 +177,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysRole sysRole = new SysRole(); BeanUtil.copyProperties(sysRoleParam, sysRole); sysRole.setStatus(CommonStatusEnum.ENABLE.getCode()); + if(ObjectUtil.isEmpty(sysRole.getDataScopeType())) { + sysRole.setDataScopeType(DataScopeTypeEnum.ALL.getCode()); + } this.save(sysRole); } diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 8b5d8843..f2cbd997 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -518,7 +518,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public List getAllUserIdList() { List resultList = CollectionUtil.newArrayList(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.ne(SysUser::getAdminType, AdminTypeEnum.SUPER_ADMIN); + queryWrapper.ne(SysUser::getAdminType, AdminTypeEnum.SUPER_ADMIN.getCode()); this.list(queryWrapper).forEach(sysUser -> { resultList.add(sysUser.getId()); }); @@ -529,7 +529,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public boolean hasAllDeletedUser(Set userIdSet) { //查询id在此集合内,且状态为删除的用户,判断其数量是否大于等于集合数量,大于是为了容错 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() - .eq(SysUser::getStatus, CommonStatusEnum.DELETED).in(SysUser::getId, userIdSet); + .eq(SysUser::getStatus, CommonStatusEnum.DELETED.getCode()).in(SysUser::getId, userIdSet); return this.count(lambdaQueryWrapper) >= userIdSet.size(); }