bug

lohir

2024-10-16 1aa33a1458ccb6c151871f00a3374c6cf9e68bdb

bug

 src/main/java/com/ycl/jxkg/controller/admin/UserController.java

@@ -1,6 +1,7 @@
package com.ycl.jxkg.controller.admin;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
@@ -26,6 +27,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -119,6 +122,12 @@
        }
        User user = new User();
        BeanUtils.copyProperties(model, user);
        user.setAge(model.getAge());
        try {
            user.setBirthDay(new SimpleDateFormat("yyyy-MM-dd").parse(model.getBirthDay()));
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }

        if (model.getId() == null) {
            String encodePwd = authenticationService.pwdEncode(model.getPassword());
@@ -164,7 +173,7 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        userService.updateById(user);
        userService.removeById(user.getId());
        return Result.ok();
    }


 src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserCreateVO.java

@@ -19,7 +19,7 @@
    @NotBlank
    private String realName;

    private String age;
    private Integer age;

    private Integer status;


 src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserEventPageRequestVO.java

@@ -11,4 +11,6 @@

    private String userName;

    private String realName;

}

 src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java

@@ -25,6 +25,7 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -70,6 +71,7 @@
        user.setPhone(form.getPhone());
        user.setRealName(form.getRealName());
        user.setSex(form.getSex());
        user.setLastUpdatePasswordTime(new Date());
        userMapper.insert(user);

        ClassesUser classesUser = new ClassesUser();
@@ -100,7 +102,13 @@
        BeanUtils.copyProperties(form, classesUser);
        baseMapper.updateById(classesUser);

        BeanUtils.copyProperties(classesUser, user);
//        BeanUtils.copyProperties(classesUser, user);
//        userMapper.updateById(user);
        user.setUserName(form.getAccount());
        user.setPassword(form.getPassword());
        user.setPhone(form.getPhone());
        user.setRealName(form.getRealName());
        user.setSex(form.getSex());
        userMapper.updateById(user);
        return Result.ok("修改成功");
    }

 src/main/resources/mapper/UserEventLogMapper.xml

@@ -32,8 +32,8 @@
            <if test="userId != null">
                and user_id= #{userId}
            </if>
            <if test="userName != null">
                and user_name= #{userName}
            <if test="realName != null">
                and real_name like  concat('%', #{realName} , '%')
            </if>
        </where>
    </select>