Browse Source

超管内置角色BUG修复

wangliang 2 years ago
parent
commit
49efd35962

+ 6 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicRoleDataPermissionServiceImpl.java

@@ -62,9 +62,12 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
             if (count > 0) {
             if (count > 0) {
                 throw ExceptionResultEnum.ERROR.exception("角色数据权限要绑在菜单级权限上");
                 throw ExceptionResultEnum.ERROR.exception("角色数据权限要绑在菜单级权限上");
             }
             }
-            this.remove(new QueryWrapper<BasicRoleDataPermission>().lambda()
-                    .eq(BasicRoleDataPermission::getSchoolId, schoolId)
-                    .eq(BasicRoleDataPermission::getRoleId, roleId));
+            QueryWrapper<BasicRoleDataPermission> basicRoleDataPermissionQueryWrapper = new QueryWrapper<BasicRoleDataPermission>();
+            if (Objects.nonNull(schoolId)) {
+                basicRoleDataPermissionQueryWrapper.lambda().eq(BasicRoleDataPermission::getSchoolId, schoolId);
+            }
+            basicRoleDataPermissionQueryWrapper.lambda().eq(BasicRoleDataPermission::getRoleId, roleId);
+            this.remove(basicRoleDataPermissionQueryWrapper);
 
 
             List<BasicRoleDataPermission> basicRoleDataPermissionList = dataPermissionInfoList.stream()
             List<BasicRoleDataPermission> basicRoleDataPermissionList = dataPermissionInfoList.stream()
                     .filter(e -> Objects.nonNull(e.getDataPermissionType()))
                     .filter(e -> Objects.nonNull(e.getDataPermissionType()))