Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-06-29 31de20695ac5fc8562c5922fcbe8729ae4e146a1

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java

@@ -86,7 +86,6 @@
    @ApiOperation(value = "根据用户名查询用户实体")
    @Cacheable(value = "user", key = "#username")
    public SysUser selectByUsername(@PathVariable String username) {

        return appUserService.selectByUsername(username);
    }

@@ -263,8 +262,8 @@
        if (checkAdmin(sysUser.getId())) {
            return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
        }
        appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
        return ResultBody.ok().data(true).msg("密码重置成功");
        ResultBody resultBody = appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
        return resultBody;
    }

    /**
@@ -327,10 +326,16 @@
        return appUserService.saveOrUpdateUser(sysUser);
    }

    /**
     * 用户注册，添加用户
     * @param userRegVo 注册信息
     * @param sysUser  当前登录用户
     * @return
     */
    @PostMapping("/users/doctorUserReg")
    @AuditLog(operation = "'注册用户:' + #userRegVo.mobile")
    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo) {
        return appUserService.doctorUserReg(userRegVo);
    @AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile")
    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) {
        return appUserService.doctorUserReg(userRegVo,sysUser);
    }

    /**
@@ -446,4 +451,11 @@

        return appUserService.findAppointUsers(Integer.parseInt(type));
    }
    /**
     * 检查该手机号是否注册
     */
    @GetMapping("users/isRegUser")
    public ResultBody isRegUser(String userTel) {
        return appUserService.isRegUser(userTel);
    }
}