Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

# Conflicts:
#	ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsController.java

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsController.java

@@ -329,12 +329,30 @@ public class DzCardsController extends BaseController
                                   @RequestParam(required = false) String openTimeEnd)
     {
         java.util.Map<String, Object> params = new java.util.HashMap<>();
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        Long campusId = null;
+        Long teacherId = null;
+        if (UserTypeEnum.isAgent(sysUser.getUserType())) {
+            agentId = sysUser.getUserTypeId();
+        } else if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+            campusId = sysUser.getUserTypeId();
+        } else if (UserTypeEnum.isTeacher(sysUser.getUserType())) {
+            teacherId = sysUser.getUserTypeId();
+        } else if(!UserTypeEnum.isSys(sysUser.getUserType())) {
+            deptId = sysUser.getDeptId();
+        }
         if (deptId != null) {
             params.put("deptId", deptId);
         }
         if (agentId != null) {
             params.put("agentId", agentId);
         }
+        if (campusId != null) {
+            params.put("campusId", campusId);
+        }
+        if (teacherId != null) {
+            params.put("teacherId", teacherId);
+        }
         if (openTimeBegin != null && !openTimeBegin.isEmpty()) {
             params.put("openTimeBegin", openTimeBegin);
         }

ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnStudentController.java

@@ -134,7 +134,7 @@ public class LearnStudentController extends BaseController
         if (UserTypeEnum.isAgent(sysUser.getUserType())) {
             dto.setAgentId(sysUser.getUserTypeId());
         } else if(UserTypeEnum.isSchool(sysUser.getUserType())) {
-            dto.setSchoolId(sysUser.getUserTypeId());
+            dto.setCampusId(sysUser.getUserTypeId());
         } else if(UserTypeEnum.isTeacher(sysUser.getUserType())) {
             dto.setTeacherId(sysUser.getUserTypeId());
         } else if(!UserTypeEnum.isSys(sysUser.getUserType())) {

ie-system/src/main/java/com/ruoyi/dz/domain/DzCards.java

@@ -179,8 +179,13 @@ public class DzCards extends BaseEntity
     /** 统计类型（用于详情查询） */
     private String statisticsType;
 
+    public Long getTeacherId() {
+        return teacherId;
+    }
 
-
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
 
     public String getNickName() {
         return nickName;
@@ -356,14 +361,6 @@ public class DzCards extends BaseEntity
         return schoolId;
     }
 
-    public Long getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
-
     public void setClassId(Long classId)
     {
         this.classId = classId;

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

@@ -397,6 +397,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="agentId != null">
             AND (T0.agent_id = #{agentId} OR T0.leaf_agent_id = #{agentId})
         </if>
+        <if test="campusId != null">
+            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 )
+        </if>
         <if test="openTimeBegin != null and openTimeBegin != ''">
             AND date(T0.open_time) &gt;= date(#{openTimeBegin})
         </if>