diff --git a/service/service-user/src/main/java/com/manager/user/controller/AccountController.java b/service/service-user/src/main/java/com/manager/user/controller/AccountController.java index ea082ef1b013a8363cad72a2f82c2062d045ad62..3f9cfd37a02b3a9dc22675bbcd7981ec5eb5c14f 100644 --- a/service/service-user/src/main/java/com/manager/user/controller/AccountController.java +++ b/service/service-user/src/main/java/com/manager/user/controller/AccountController.java @@ -19,13 +19,13 @@ public class AccountController { @ApiOperation(value = "账号基本资料修改") @PostMapping("/modify-info") - public Result modifyInfo(Integer id,String name){ - return userService.modifyInfo(id,name); + public Result modifyInfo(String account,String name){ + return userService.modifyInfo(account,name); } @ApiOperation(value = "账号密码修改") @PostMapping("/modify-password") - public Result modifyPassword(Integer id,String oldPassword,String newPassword){ - return userService.modifyPassword(id,oldPassword,newPassword); + public Result modifyPassword(String account,String oldPassword,String newPassword){ + return userService.modifyPassword(account,oldPassword,newPassword); } } diff --git a/service/service-user/src/main/java/com/manager/user/service/UserService.java b/service/service-user/src/main/java/com/manager/user/service/UserService.java index ebff03d8742139302c5a0c4c18c2f740082e3e76..1008a6340ef7cef83055d8ee8a3b7a6cdbea4420 100644 --- a/service/service-user/src/main/java/com/manager/user/service/UserService.java +++ b/service/service-user/src/main/java/com/manager/user/service/UserService.java @@ -23,9 +23,9 @@ public interface UserService extends IService { //导出跟进内容 void exportUpdateContent(HttpServletResponse response); //修改基本资料 - Result modifyInfo(Integer id, String name); + Result modifyInfo(String account, String name); //修改密码 - Result modifyPassword(Integer id, String oldPassword, String newPassword); + Result modifyPassword(String account, String oldPassword, String newPassword); //批量启用销售 Result ableSellers(List ids); //导出销售信息 diff --git a/service/service-user/src/main/java/com/manager/user/service/impl/UserServiceImpl.java b/service/service-user/src/main/java/com/manager/user/service/impl/UserServiceImpl.java index bfa9333e86055d74eddb1a0fb346cedfb4589a40..79e27d7fc2d78be55da9cc0c1bde00d260899e7e 100644 --- a/service/service-user/src/main/java/com/manager/user/service/impl/UserServiceImpl.java +++ b/service/service-user/src/main/java/com/manager/user/service/impl/UserServiceImpl.java @@ -109,8 +109,13 @@ public class UserServiceImpl extends ServiceImpl implements Us //修改基本资料 @Override - public Result modifyInfo(Integer id, String name) { - User user = this.getById(id); + public Result modifyInfo(String account, String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(User::getAccount,account); + User user = this.getOne(wrapper); + if (user == null){ + return Result.fail("用户不存在"); + } user.setName(name); this.updateById(user); return Result.ok(true); @@ -118,8 +123,13 @@ public class UserServiceImpl extends ServiceImpl implements Us //修改密码 @Override - public Result modifyPassword(Integer id, String oldPassword, String newPassword) { - User user = this.getById(id); + public Result modifyPassword(String account, String oldPassword, String newPassword) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(User::getAccount,account); + User user = this.getOne(wrapper); + if (user == null){ + return Result.fail("用户不存在"); + } String old = user.getPassword(); if (!old.equals(oldPassword)){ return Result.fail(OLD_PASSWORD_ERROR);