gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】修复部分业务实现使用枚举不当的问题 、修复在ORACLE数据库下由于数据库未设置默认值导致新增角色时数据范围类型为null报错

pull/93/head
小诺 2022-09-07 15:30:52 +08:00 committed by 俞宝山
parent 4f7364e6c7
commit 0a0ecefed0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
View File

@ -177,6 +177,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> 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);
}

4
snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -518,7 +518,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public List<Long> getAllUserIdList() {
List<Long> resultList = CollectionUtil.newArrayList();
LambdaQueryWrapper<SysUser> 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<SysUserMapper, SysUser> impl
public boolean hasAllDeletedUser(Set<Long> userIdSet) {
//查询id在此集合内，且状态为删除的用户，判断其数量是否大于等于集合数量，大于是为了容错
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<SysUser>()
.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();
}