|
|
@@ -148,6 +148,7 @@ public class MallUserInfoController extends BaseController { |
|
|
@SystemControllerLog(description = "用户管理-修改用户") |
|
|
@SystemControllerLog(description = "用户管理-修改用户") |
|
|
public ResultData updateUser(@RequestBody MallUserInfo userInfo) { |
|
|
public ResultData updateUser(@RequestBody MallUserInfo userInfo) { |
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); |
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); |
|
|
|
|
|
boolean bChangedPhone = false; |
|
|
MallUserInfo currentUser = getUser(); |
|
|
MallUserInfo currentUser = getUser(); |
|
|
// 只有超管和自己能更新信息 |
|
|
// 只有超管和自己能更新信息 |
|
|
if (!(currentUser.getId().equals(userInfo.getId()) || |
|
|
if (!(currentUser.getId().equals(userInfo.getId()) || |
|
|
@@ -164,6 +165,7 @@ public class MallUserInfoController extends BaseController { |
|
|
if(checkUniquePhone(userInfo.getPhone()) > 0){ |
|
|
if(checkUniquePhone(userInfo.getPhone()) > 0){ |
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); |
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); |
|
|
} |
|
|
} |
|
|
|
|
|
bChangedPhone = true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
userInfo.setTenantId(getTenantId()); |
|
|
userInfo.setTenantId(getTenantId()); |
|
|
@@ -190,8 +192,11 @@ public class MallUserInfoController extends BaseController { |
|
|
if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { |
|
|
if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { |
|
|
adminUser.setPassword(userInfo.getPassword()); |
|
|
adminUser.setPassword(userInfo.getPassword()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(userInfo.getUsername())) { |
|
|
|
|
|
adminUser.setUsername(userInfo.getUsername()); |
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(userInfo.getNickName())) { |
|
|
|
|
|
adminUser.setNickName(userInfo.getNickName()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(userInfo.getPhone())) { |
|
|
|
|
|
adminUser.setPhone(userInfo.getPhone()); |
|
|
} |
|
|
} |
|
|
userInfoService.saveOrUpdate(adminUser); |
|
|
userInfoService.saveOrUpdate(adminUser); |
|
|
} else { |
|
|
} else { |
|
|
@@ -204,6 +209,10 @@ public class MallUserInfoController extends BaseController { |
|
|
userRoleService.saveOrUpdate(r); |
|
|
userRoleService.saveOrUpdate(r); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
if(bChangedPhone) { |
|
|
|
|
|
// 手机号修改,清除bopen_id, 清除web_open_id |
|
|
|
|
|
userInfoService.cleanAllOpenId(userInfo); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
} |
|
|
} |
|
|
|