From 0a0ecefed032928ef74e870d9d81cc2cd75f1eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Wed, 7 Sep 2022 15:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9E=9A=E4=B8=BE=E4=B8=8D=E5=BD=93=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9C=A8ORACLE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8B=E7=94=B1=E4=BA=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9C=AA=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E5=AF=BC=E8=87=B4=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BAnull=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/role/service/impl/SysRoleServiceImpl.java     | 3 +++
 .../sys/modular/user/service/impl/SysUserServiceImpl.java     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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<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);
     }
 
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<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();
     }