From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 096f57b..a585e21 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/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);
}
@@ -212,9 +211,9 @@
*/
@ApiOperation(value = "用户查询列表")
@GetMapping("/users/HDoctorusers")
- public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
+ public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
- return appUserService.hospitalDoctorList(hospitalId, departmentId);
+ return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
} else {
return ResultBody.failed("查询参数有误");
}
@@ -294,7 +293,14 @@
* @return
*/
@PutMapping(value = "/users/updateusertel")
- public ResultBody updateUserTel(@RequestParam Map<String, Object> params) {
+ public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
+ String oldTel = MapUtils.getString(params, "oldTel");
+ if (oldTel==null){
+ return ResultBody.failed("请输入原账号");
+ }
+ if(!sysUser.getUsername().equals(oldTel)){
+ return ResultBody.failed("请输入正确的原账号");
+ }
return appUserService.updateUserTel(params);
}
@@ -452,4 +458,16 @@
return appUserService.findAppointUsers(Integer.parseInt(type));
}
+ /**
+ * 检查该手机号是否注册 false 未注册 true已经注册
+ */
+ @GetMapping("users/isRegUser")
+ public ResultBody isRegUser(String userTel) {
+
+ if(appUserService.phoneIsUsed(userTel))
+ {
+ return ResultBody.ok().data(true);
+ }
+ return ResultBody.failed().data(false);
+ }
}
--
Gitblit v1.8.0