老师的班级满足校区或学校的班级都可以

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -240,7 +240,7 @@ public class UserController extends BaseController {
             user.setSchoolId(dzTeacher.getSchoolId());
             user.setSchoolName(dzTeacher.getSchoolName());
             if(null != dzTeacher.getCampusId()) {
-                user.setCampusName(dzSchoolMapper.selectDzSchoolById(user.getSchoolId()).getName());
+                user.setCampusName(dzSchoolMapper.selectDzSchoolById(dzTeacher.getCampusId()).getName());
             }
             List<String> campusClassList = Lists.newArrayList();
             List<String> schoolClassList = Lists.newArrayList();

ie-system/src/main/resources/mapper/dz/DzCardsMapper.xml

@@ -123,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND (agent_id = #{agentId} OR agent_id IN ( SELECT t.agent_id FROM dz_agent t WHERE t.agent_id=#{agentId} ))
             </if>
             <if test="teacherId != null ">
-                AND c.class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date )
+                AND (c.class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date )
+                    or c.campus_class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date ))
             </if>
             <if test="leafAgentId != null "> and c.leaf_agent_id = #{leafAgentId}</if>
             <if test="campusId != null "> and c.campus_id = #{campusId}</if>
@@ -401,7 +402,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND T0.campus_id = #{campusId}
         </if>
         <if test="teacherId != null">
-            AND T0.class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date )
+            AND (T0.class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date )
+                or T0.campus_class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date ))
         </if>
         <if test="openTimeBegin != null and openTimeBegin != ''">
             AND date(T0.open_time) &gt;= date(#{openTimeBegin})

ie-system/src/main/resources/mapper/learn/LearnStudentMapper.xml

@@ -197,7 +197,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="deptId != null"> AND SBI.dept_id = #{deptId}</if>
             <if test="schoolId != null"> AND SBI.school_id = #{schoolId}</if>
-            <if test="teacherId != null"> AND SBI.class_id in ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id = #{teacherId} and now() &lt; t.out_date)</if>
+            <if test="teacherId != null"> AND (SBI.class_id in ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id = #{teacherId} and now() &lt; t.out_date)
+                 or SBI.campus_class_id in ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id = #{teacherId} and now() &lt; t.out_date))</if>
             <if test="classId != null"> AND SBI.class_id = #{classId}</if>
             <if test="campusId != null"> AND SBI.campus_id = #{campusId}</if>
             <if test="campusClassId != null"> AND SBI.campus_class_id = #{campusClassId}</if>