增加校区管理员

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -48,8 +49,12 @@ public class DzCampusController extends BaseController
     public TableDataInfo list(DzSchool dzSchool)
     {
         dzSchool.setCampus(true);
-        if(!UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(!UserTypeEnum.isSys(sysUser.getUserType())) {
             dzSchool.setDeptId(SecurityUtils.getDeptId());
+            if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+                dzSchool.setId(sysUser.getUserTypeId());
+            }
         }
         startPage();
         List<DzSchool> list= dzSchoolService.selectDzSchoolList(dzSchool);

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

@@ -58,8 +58,11 @@ public class DzClassesController extends BaseController
     {
         startPage();
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        if(!UserTypeEnum.isSys(sysUser.getUserType())) {
+        if (!UserTypeEnum.isSys(sysUser.getUserType())) {
             dzClasses.setDeptId(sysUser.getDeptId());
+            if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+                dzClasses.setSchoolId(sysUser.getUserTypeId());
+            }
         }
         List<DzClasses> list = dzClassesService.selectDzClassesList(dzClasses);
         return getDataTable(list);

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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.ValidationException;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.BoolValues;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -104,9 +105,13 @@ public class DzSchoolController extends BaseController
     @GetMapping("/getCampusSchoolList")
     public AjaxResult getCampusSchoolList(DzSchool dzSchool)
     {
-        if(null == dzSchool.getCampus() && !UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(null == dzSchool.getCampus() && !UserTypeEnum.isSys(sysUser.getUserType())) {
             dzSchool.setCampus(true);
         }
+        if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+            dzSchool.setId(sysUser.getUserTypeId());
+        }
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
         return AjaxResult.success(list);
     }

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

@@ -49,8 +49,12 @@ public class DzTeacherController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DzTeacher dzTeacher)
     {
-        if(!UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())){
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(!UserTypeEnum.isSys(sysUser.getUserType())){
             dzTeacher.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+            if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+                dzTeacher.setSchoolId(sysUser.getUserTypeId());
+            }
         }
         startPage();
         List<DzTeacher> list = dzTeacherService.selectDzTeacherList(dzTeacher);

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

@@ -28,6 +28,10 @@ public class DzSchool extends BaseEntity
     @Excel(name = "机构ID")
     private Long deptId;
 
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
     /** 地域 */
     @Excel(name = "地域")
     private String location;
@@ -54,6 +58,14 @@ public class DzSchool extends BaseEntity
 
     private Boolean campus;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public String getProCityAreaName() {
         return proCityAreaName;
     }

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

@@ -2,6 +2,9 @@ package com.ruoyi.dz.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.enums.UserTypeEnum;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
@@ -19,6 +22,8 @@ public class DzSchoolServiceImpl implements IDzSchoolService
 {
     @Autowired
     private DzSchoolMapper dzSchoolMapper;
+    @Autowired
+    private ISysUserService userService;
 
     /**
      * 查询机构校区
@@ -61,6 +66,12 @@ public class DzSchoolServiceImpl implements IDzSchoolService
     {
         dzSchool.setCreateTime(DateUtils.getNowDate());
         dzSchoolMapper.insertDzSchool(dzSchool);
+        if(null != dzSchool.getDeptId() && dzSchool.getDeptId() > 0) {
+            Long campusId = dzSchool.getId();
+            Long userId = userService.insertRelateUser(UserTypeEnum.School, campusId, dzSchool.getDeptId(), String.valueOf(campusId), dzSchool.getName());
+            dzSchool.setUserId(userId);
+            dzSchoolMapper.updateDzSchool(dzSchool);
+        }
         return dzSchool.getId().intValue();
     }
 

ie-system/src/main/java/com/ruoyi/enums/UserTypeEnum.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum UserTypeEnum {
-    Sys("00"), Card("01"), Agent("10"), Teacher("11"), Institution("12"); // 用户类型（00系统01卡10代理11老师12机构）
+    Sys("00"), Card("01"), Agent("10"), Teacher("11"), Institution("12"), School("13"); // 用户类型（00系统01卡10代理11老师12机构）
 
     private final String val;
 
@@ -46,4 +46,11 @@ public enum UserTypeEnum {
         return Sys.val.equalsIgnoreCase(val)||Sys.name().equalsIgnoreCase(val);
     }
 
+    public static Boolean isSchool(String val){
+        if (StringUtils.isEmpty(val)){
+            return false;
+        }
+        return School.val.equalsIgnoreCase(val) || School.name().equalsIgnoreCase(val);
+    }
+
 }

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDzSchoolList" parameterType="DzSchool" resultMap="DzSchoolResult">
         <include refid="selectDzSchoolVo"/>
         <where>
+            <if test="id != null "> and t1.id = #{id}</if>
             <if test="name != null  and name != ''"> and t1.name like concat('%', #{name}, '%')</if>
 <!--            <if test="deptId != null "> and t1.dept_id = #{deptId}</if>-->
             <if test="deptId != null ">