#

luxiaotao1123

2024-04-10 83820ff6205f8a4502576f5cec48c911eb5f48a1

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java

@@ -9,6 +9,7 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.system.controller.param.ResetPwdParam;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserRole;
import com.zy.asrs.wcs.system.service.UserRoleService;
@@ -186,9 +187,15 @@
    @PreAuthorize("hasAuthority('system:user:update')")
    @OperationLog("重置密码")
    @PostMapping("/user/reset/pwd")
    public R resetPwd(@RequestBody User user) {
        if (!Cools.isEmpty(user.getPassword())) {
            user.setPassword(userService.encodePassword(user.getPassword()));
    public R resetPwd(@RequestBody ResetPwdParam param) {
        User user = userService.getById(param.getId());
        if (!Cools.isEmpty(param.getOldPwd())) {
            if (!userService.comparePassword(user.getPassword(), param.getOldPwd())) {
                return R.error("当前密码错误");
            }
        }
        if (!Cools.isEmpty(param.getPassword())) {
            user.setPassword(userService.encodePassword(param.getPassword()));
        }
        user.setUpdateBy(getLoginUserId());
        user.setUpdateTime(new Date());