xiangpei
2025-05-14 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403
bug:学员有状态不能修改问题
5个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/mindskip/xzs/controller/admin/UserController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/repository/UserMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/UserService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -82,7 +82,7 @@
    @RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
    public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        User user = userService.getUserInfoById(id);
        UserResponseVM userVm = UserResponseVM.from(user);
        List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
        String deptIds = "";
@@ -188,7 +188,7 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public RestResponse delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        User user = userService.getUserInfoById(id);
        user.setDeleted(true);
        userService.updateByIdFilter(user);
        return RestResponse.ok();
src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -33,6 +33,7 @@
     * @return User
     */
    User getUserById(Integer id);
    User getUserInfoById(Integer id);
    /**
     * getUserByUserName
src/main/java/com/mindskip/xzs/service/UserService.java
@@ -27,6 +27,7 @@
     * @return User
     */
    User getUserById(Integer id);
    User getUserInfoById(Integer id);
    /**
     * getUserByUserName
src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -48,6 +48,11 @@
    }
    @Override
    public User getUserInfoById(Integer id) {
        return userMapper.getUserInfoById(id);
    }
    @Override
    public User getUserByUserName(String username) {
        return userMapper.getUserByUserName(username);
    }
src/main/resources/mapper/UserMapper.xml
@@ -271,6 +271,13 @@
    where id=#{value} and status = 1 and deleted = 0 and (`condition` = 0 or `condition` is null)
  </select>
    <select id="getUserInfoById" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from t_user
        where id=#{value} and deleted = 0
    </select>
    <select id="getUserByUserName" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>