bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskPrint.java

@@ -73,6 +73,9 @@ public class ExamTaskPrint extends BaseEntity implements Serializable {
     @TableField(value = "student_count")
     private Integer studentCount;
 
+    @TableField(value = "campus_id")
+    private String campusId;
+
     @TableField(value = "print_house_id")
     private String printHouseId;
 
@@ -210,6 +213,14 @@ public class ExamTaskPrint extends BaseEntity implements Serializable {
         this.studentCount = studentCount;
     }
 
+    public String getCampusId() {
+        return campusId;
+    }
+
+    public void setCampusId(String campusId) {
+        this.campusId = campusId;
+    }
+
     public String getPrintHouseId() {
         return printHouseId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskPrintServiceImpl.java

@@ -249,6 +249,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             taskPrint.setClassId(examTaskPrint.getClassId());
             taskPrint.setClassName(examTaskPrint.getClassName());
             taskPrint.setStudentCount(examTaskPrint.getStudentCount());
+            taskPrint.setCampusId(examTaskPrint.getCampusId());
             taskPrint.setPrintHouseId(examTaskPrint.getPrintHouseId());
             taskPrint.setUpdateId(sysUser.getId());
             taskPrint.setUpdateTime(System.currentTimeMillis());

distributed-print-business/src/main/resources/mapper/ExamTaskPrintMapper.xml

@@ -39,6 +39,7 @@
             a.class_id classId,
             a.class_name className,
             a.student_count studentCount,
+            a.campus_id campusId,
             a.print_house_id printHouseId,
             c.name printHouseName,
             a.exam_detail_id examDetailId,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleServiceImpl.java

@@ -248,7 +248,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
         Long finalSchoolId = schoolId;
-        queryWrapper.lambda().eq(SysRole::getEnable, true).and(e -> e.eq(SysRole::getSchoolId, finalSchoolId).or().isNull(SysRole::getSchoolId));
+        queryWrapper.lambda().eq(SysRole::getEnable, true).and(e -> e.eq(SysRole::getSchoolId, finalSchoolId));
         return this.list(queryWrapper);
     }
 }