xiangpei
2024-05-27 6d3482679dc6730ec4eb247130db0763e4704727
修改用学员时处理部门管理员标识
2个文件已修改
17 ■■■■■ 已修改文件
src/main/java/com/mindskip/xzs/controller/admin/UserController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserDepartmentMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -21,10 +21,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;
@@ -141,11 +138,17 @@
            user.setModifyTime(new Date());
            userService.updateByIdFilter(user);
        }
        Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
        userDepartmentMapper.removeByUserId(user.getId());
        for (Integer s : model.getDeptIds()) {
            UserDepartment userDepartment = new UserDepartment();
            userDepartment.setUserId(user.getId());
            userDepartment.setDepartmentId(s);
            if (Objects.nonNull(oldDeptUser.get(s))) {
                userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
            } else {
                userDepartment.setDeptAdmin("0");
            }
            userDepartmentMapper.insert(userDepartment);
        }
        if (ObjectUtils.isNotEmpty(model.getTagIds())) {
src/main/resources/mapper/UserDepartmentMapper.xml
@@ -7,13 +7,13 @@
        <result column="department_id" jdbcType="INTEGER" property="departmentId" />
    </resultMap>
    <sql id="Base_Column_List">
        id, user_id, department_id
        id, user_id, department_id, dept_admin
    </sql>
    <insert id="insert" parameterType="com.mindskip.xzs.domain.UserDepartment" useGeneratedKeys="true" keyProperty="id">
        insert into t_user_department (id, user_id, department_id
        insert into t_user_department (id, user_id, department_id, dept_admin
        )
        values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}
        values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{deptAdmin}
               )
    </insert>