|
|
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
10
|
10
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
11
|
11
|
import org.springframework.web.bind.annotation.RestController;
|
|
12
|
12
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
13
|
+import com.ruoyi.common.core.constant.UserConstants;
|
|
13
|
14
|
import com.ruoyi.common.core.domain.R;
|
|
14
|
15
|
import com.ruoyi.common.core.utils.SecurityUtils;
|
|
15
|
16
|
import com.ruoyi.common.core.utils.ServletUtils;
|
|
|
@@ -64,6 +65,16 @@ public class SysProfileController extends BaseController
|
|
64
|
65
|
@PutMapping
|
|
65
|
66
|
public AjaxResult updateProfile(@RequestBody SysUser user)
|
|
66
|
67
|
{
|
|
|
68
|
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
|
|
|
69
|
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
|
|
70
|
+ {
|
|
|
71
|
+ return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
|
72
|
+ }
|
|
|
73
|
+ else if (StringUtils.isNotEmpty(user.getEmail())
|
|
|
74
|
+ && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
|
|
75
|
+ {
|
|
|
76
|
+ return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
|
77
|
+ }
|
|
67
|
78
|
if (userService.updateUserProfile(user) > 0)
|
|
68
|
79
|
{
|
|
69
|
80
|
LoginUser loginUser = tokenService.getLoginUser();
|