caozixuan 1 жил өмнө
parent
commit
35fc8c989e

+ 1 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicExamStudentServiceImpl.java

@@ -183,6 +183,7 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
             }
 
             this.removeByIds(idList);
+            basicExamStudentList.stream().map(BasicExamStudent::getClazzId).distinct().forEach(e -> basicTeachClazzService.deleteFreeClazz(e));
         }
     }
 

+ 2 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicRoleDataPermissionServiceImpl.java

@@ -200,7 +200,8 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
             queryWrapper.lambda().eq(BasicRoleDataPermission::getRoleId, roleId)
                     .eq(BasicRoleDataPermission::getPrivilegeId, privilegeId);
             if (sysRole.getDefaultRole()) {
-                queryWrapper.lambda().isNull(BasicRoleDataPermission::getSchoolId);
+                queryWrapper.lambda().and(t -> t.isNull(BasicRoleDataPermission::getSchoolId).or()
+                        .eq(BasicRoleDataPermission::getSchoolId, schoolId));
             } else {
                 queryWrapper.lambda().eq(BasicRoleDataPermission::getSchoolId, schoolId);
             }