老师和班级调整

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

@@ -6,11 +6,14 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 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;
 import com.ruoyi.dz.domain.DzTeacher;
 import com.ruoyi.dz.domain.DzTeacherClass;
 import com.ruoyi.dz.service.IDzTeacherClassService;
+import com.ruoyi.enums.UserTypeEnum;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +57,10 @@ public class DzClassesController extends BaseController
     public TableDataInfo list(DzClasses dzClasses)
     {
         startPage();
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(!UserTypeEnum.isSys(sysUser.getUserType())) {
+            dzClasses.setDeptId(sysUser.getDeptId());
+        }
         List<DzClasses> list = dzClassesService.selectDzClassesList(dzClasses);
         return getDataTable(list);
     }

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

@@ -99,11 +99,16 @@ public class DzTeacherController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody DzTeacher dzTeacher)
     {
+        if (UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzTeacher.setCampusId(null);
+        } else {
+            dzTeacher.setSchoolId(null);
+        }
         dzTeacherService.updateDzTeacher(dzTeacher);
         //同时修改sys_user表的nickName
         SysUser user = userService.selectUserByUserName(String.valueOf(dzTeacher.getTeacherId()));
-        if (null!=user){
-            if (!user.getNickName().equalsIgnoreCase(dzTeacher.getName())){
+        if (null != user) {
+            if (null == user.getNickName() || !user.getNickName().equalsIgnoreCase(dzTeacher.getName())) {
                 user.setNickName(dzTeacher.getName());
                 userService.updateUserInfo(user);
             }

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

@@ -20,6 +20,8 @@ public class DzClasses extends BaseEntity
     private Long[] classIds;
     private Long teacherId;
 
+    @Excel(name = "机构")
+    private Long deptId;
     /** 学校 */
     @Excel(name = "学校")
     private Long schoolId;
@@ -48,6 +50,14 @@ public class DzClasses extends BaseEntity
     @Excel(name = "统计数据")
     private String stats;
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     public Integer getIsDefault() {
         return isDefault;
     }

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

@@ -6,6 +6,7 @@
 
     <resultMap type="DzClasses" id="DzClassesResult">
         <result property="classId"    column="class_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="schoolId"    column="school_id"    />
         <result property="year"    column="year"    />
         <result property="name"    column="name"    />
@@ -29,7 +30,7 @@
     </resultMap>
 
     <sql id="selectDzClassesVo">
-        select t1.class_id, t1.school_id, t1.year, t1.name, t1.online, t1.status, t1.stats, t1.create_time, t1.update_time,t1.is_default,
+        select t1.class_id, t1.dept_id, t1.school_id, t1.year, t1.name, t1.online, t1.status, t1.stats, t1.create_time, t1.update_time,t1.is_default,
         t2.id, t2.name school_name, t2.dept_id, t2.pro, t2.city, t2.area
         from dz_classes t1
         left join dz_school t2 on t1.school_id=t2.id
@@ -39,6 +40,8 @@
         <include refid="selectDzClassesVo"/>
         <where>
             <if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
+            <if test="deptId != null and deptId > 0 "> and t1.dept_id = #{deptId}</if>
+            <if test="deptId == 0 "> and t1.dept_id is null </if>
             <if test="year != null "> and t1.year = #{year}</if>
             <if test="name != null  and name != ''"> and t1.name like concat('%', #{name}, '%')</if>
             <if test="online != null "> and t1.online = #{online}</if>
@@ -72,6 +75,7 @@
     <insert id="insertDzClasses" parameterType="DzClasses" useGeneratedKeys="true" keyProperty="classId">
         insert into dz_classes
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">dept_id,</if>
             <if test="schoolId != null">school_id,</if>
             <if test="year != null">year,</if>
             <if test="name != null and name != ''">name,</if>
@@ -83,6 +87,7 @@
             <if test="isDefault != null">is_default,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
             <if test="schoolId != null">#{schoolId},</if>
             <if test="year != null">#{year},</if>
             <if test="name != null and name != ''">#{name},</if>
@@ -98,6 +103,7 @@
     <update id="updateDzClasses" parameterType="DzClasses">
         update dz_classes
         <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="schoolId != null">school_id = #{schoolId},</if>
             <if test="year != null">year = #{year},</if>
             <if test="name != null and name != ''">name = #{name},</if>