|
@@ -13,12 +13,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.config.RuoYiConfig;
|
|
|
+import com.ruoyi.common.constant.UserConstants;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.ShiroUtils;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.file.FileUploadUtils;
|
|
|
import com.ruoyi.framework.shiro.service.SysPasswordService;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
@@ -135,6 +137,16 @@ public class SysProfileController extends BaseController
|
|
|
currentUser.setEmail(user.getEmail());
|
|
|
currentUser.setPhonenumber(user.getPhonenumber());
|
|
|
currentUser.setSex(user.getSex());
|
|
|
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
|
|
|
+ && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(currentUser)))
|
|
|
+ {
|
|
|
+ return error("修改用户'" + currentUser.getLoginName() + "'失败,手机号码已存在");
|
|
|
+ }
|
|
|
+ else if (StringUtils.isNotEmpty(user.getEmail())
|
|
|
+ && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(currentUser)))
|
|
|
+ {
|
|
|
+ return error("修改用户'" + currentUser.getLoginName() + "'失败,邮箱账号已存在");
|
|
|
+ }
|
|
|
if (userService.updateUserInfo(currentUser) > 0)
|
|
|
{
|
|
|
ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId()));
|