1'

src/main/java/com/fdkankan/sale/controller/SysUserController.java

@@ -49,19 +49,15 @@ public class SysUserController extends BaseController{
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         param.setCreateUserId(getUserId());
-        sysUserService.addOrUpdate(param);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/update")
-    public ResultData update(@RequestBody SysUserParam param){
-        if(param.getId() == null){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        SysUser user = sysUserService.getByUserNameDb2(param.getUserName());
+        if(user ==null){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
         }
-        sysUserService.addOrUpdate(param);
+        sysUserService.addOrUpdate(user,param);
         return ResultData.ok();
     }
 
+
     @PostMapping("/delete")
     public ResultData delete(@RequestBody SysUserParam param){
         if(param.getId() == null){
@@ -71,26 +67,6 @@ public class SysUserController extends BaseController{
         return ResultData.ok();
     }
 
-    @PostMapping("/rePassword")
-    public ResultData rePassword(@RequestBody SysUserParam param){
-        if(param.getId() == null || StringUtils.isEmpty(param.getNewPassword())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        sysUserService.addOrUpdate(param);
-        return ResultData.ok();
-    }
-
-    @PostMapping("/reMyselfPassword")
-    public ResultData reMyselfPassword(@RequestBody SysUserParam param){
-        if(param.getId() == null || StringUtils.isEmpty(param.getNewPassword())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        if(!getUserId().equals(param.getId())){
-            throw new BusinessException(ResultCode.UPDATE_MYSELF_PASSWORD);
-        }
-        sysUserService.addOrUpdate(param);
-        return ResultData.ok();
-    }
 
     @PostMapping("/list")
     public ResultData list(@RequestBody SysUserParam param){

src/main/java/com/fdkankan/sale/service/ISysUserService.java

@@ -25,7 +25,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     ManageLoginResponse getUserByUserNameAndPassword(String userName, String password);
 
-    void addOrUpdate(SysUserParam param);
+    void addOrUpdate(SysUser user,SysUserParam param);
 
     PageInfo pageList(SysUserParam param);
 

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -94,28 +94,21 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
     }
 
     @Override
-    public void addOrUpdate(SysUserParam param) {
-        SysUser user = this.getByUserNameDb2(param.getUserName());
-        if(user ==null){
-            throw new BusinessException(ResultCode.USER_NOT_EXIST);
-        }
+    @DS("db1")
+    public void addOrUpdate(SysUser user,SysUserParam param) {
         SysUser user2 = this.getByUserName(param.getUserName());
         if(user2 !=null){
             throw new BusinessException(ResultCode.USER_EXIST);
         }
-        this.saveDb1(user,param);
-    }
-
-    @DS("db1")
-    private void saveDb1(SysUser user,SysUserParam param) {
-        user.setId(null);
         user.setManageId(user.getId());
+        user.setId(null);
         user.setRoleId(param.getRoleId());
         user.setCreateUserId(param.getCreateUserId());
         user.setUpdateTime(null);
         this.save(user);
     }
 
+
     @Override
     public PageInfo pageList(SysUserParam param) {
         Page<SysUserVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);