过期条件调整

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

@@ -69,6 +69,14 @@ public class DzClassesController extends BaseController
                 dzClasses.setSchoolId(sysUser.getUserTypeId());
             }
         }
+        if(null != dzClasses.getSchoolId()) {
+            DzSchool dzSchool = dzSchoolMapper.selectDzSchoolById(dzClasses.getSchoolId());
+            if (null == dzSchool.getDeptId()) {
+                dzClasses.setDeptId(0L);
+            } else {
+                dzClasses.setDeptId(dzSchool.getDeptId());
+            }
+        }
         List<DzClasses> list = dzClassesService.selectDzClassesList(dzClasses);
         return getDataTable(list);
     }

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

@@ -58,7 +58,7 @@ public class DzSchoolController extends BaseController
     /**
      * 查询机构校区列表
      */
-    @PreAuthorize("@ss.hasPermi('dz:school:list')")
+    // @PreAuthorize("@ss.hasPermi('dz:school:list')")
     @GetMapping("/list")
     public TableDataInfo list(DzSchool dzSchool)
     {

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

@@ -66,7 +66,9 @@ public class DzTeacherController extends BaseController
     public TableDataInfo list(DzTeacher dzTeacher)
     {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        if(!UserTypeEnum.isSys(sysUser.getUserType())){
+        if (UserTypeEnum.isAgent(sysUser.getUserType())) {
+            dzTeacher.setAgentId(sysUser.getUserTypeId());
+        } else if(!UserTypeEnum.isSys(sysUser.getUserType())){
             dzTeacher.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
             if (UserTypeEnum.isSchool(sysUser.getUserType())) {
                 if(null == sysUser.getDeptId() || sysUser.getDeptId().equals(100L)) {
@@ -90,6 +92,19 @@ public class DzTeacherController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DzTeacher dzTeacher)
     {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if (UserTypeEnum.isAgent(sysUser.getUserType())) {
+            dzTeacher.setAgentId(sysUser.getUserTypeId());
+        } else if(!UserTypeEnum.isSys(sysUser.getUserType())){
+            dzTeacher.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+            if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+                if(null == sysUser.getDeptId() || sysUser.getDeptId().equals(100L)) {
+                    dzTeacher.setSchoolId(sysUser.getUserTypeId());
+                } else {
+                    dzTeacher.setCampusId(sysUser.getUserTypeId());
+                }
+            }
+        }
         List<DzTeacher> list = dzTeacherService.selectDzTeacherList(dzTeacher);
         list =  processTeacherList(list);
         ExcelUtil<DzTeacher> util = new ExcelUtil<DzTeacher>(DzTeacher.class);

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,6 +1,10 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.enums.UserTypeEnum;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,6 +49,17 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    @GetMapping("/list2")
+    public AjaxResult list2(SysDept dept)
+    {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(!UserTypeEnum.isSys(sysUser.getUserType())){
+            dept.setDeptId(sysUser.getDeptId());
+        }
+        List<SysDept> depts = deptService.selectDeptList2(dept);
+        return success(depts);
+    }
+
     /**
      * 查询机构列表（排除节点）
      */

ie-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -18,6 +18,7 @@ public interface ISysDeptService
      * @return 机构信息集合
      */
     public List<SysDept> selectDeptList(SysDept dept);
+    public List<SysDept> selectDeptList2(SysDept dept);
 
     /**
      * 查询机构树结构信息

ie-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -54,6 +54,12 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectDeptList(dept);
     }
 
+    @Override
+    public List<SysDept> selectDeptList2(SysDept dept)
+    {
+        return deptMapper.selectDeptList(dept);
+    }
+
     /**
      * 查询机构树结构信息
      * 

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

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDzCardsOpenList" parameterType="DzCardsOpen" resultMap="DzCardsOpenResult">
         <include refid="selectDzCardsOpenVo"/>
         <where>
-            <if test="agentId != null "> and agent_id IN ( SELECT t.agent_id FROM dz_agent t WHERE t.parent_id = #{agentId})</if>
+            <if test="agentId != null "> and agent_id IN ( SELECT t.agent_id FROM dz_agent t WHERE t.agent_id=#{agentId} or t.parent_id=#{agentId} )</if>
             <if test="startNo != null  and startNo != ''"> and start_no = #{startNo}</if>
             <if test="endNo != null  and endNo != ''"> and end_no = #{endNo}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>

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

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="userId != null "> and t1.user_id = #{userId}</if>
             <if test="deptId != null "> and t1.dept_id = #{deptId}</if>
-            <if test="agentId != null "> and t1.agent_id = #{agentId}</if>
+            <if test="agentId != null "> and t1.agent_id in ( SELECT t.agent_id FROM dz_agent t WHERE t.agent_id=#{agentId} or t.parent_id=#{agentId} )</if>
             <if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
             <if test="campusId != null "> and t1.campus_id = #{campusId}</if>
             <if test="name != null  and name != ''"> and t1.name like concat('%', #{name}, '%')</if>