| @@ -181,6 +181,9 @@ public class BaseController { | |||||
| WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone); | WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone); | ||||
| if (basicInfo != null) { | if (basicInfo != null) { | ||||
| if(byId != null && !byId.getPhone().equals(basicInfo.getPhone())){ | |||||
| return Long.valueOf(-1); | |||||
| } | |||||
| // WxCUserBasicInfo basicInfo = list.get(0); | // WxCUserBasicInfo basicInfo = list.get(0); | ||||
| // 微信名称,统一成微信昵称 | // 微信名称,统一成微信昵称 | ||||
| // if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) { | // if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) { | ||||
| @@ -80,6 +80,9 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| } | } | ||||
| Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); | Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); | ||||
| if (null != basicUserId) { | if (null != basicUserId) { | ||||
| if(basicUserId.intValue() == -1){ | |||||
| return rd; | |||||
| } | |||||
| user.setUserId(basicUserId); | user.setUserId(basicUserId); | ||||
| } | } | ||||
| // 更新 WxCUser | // 更新 WxCUser | ||||
| @@ -660,6 +660,9 @@ public class WxUserGrantController extends BaseController { | |||||
| // 更新到basicinfo | // 更新到basicinfo | ||||
| Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); | Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); | ||||
| if (null != userBasicId) { | if (null != userBasicId) { | ||||
| if(userBasicId.intValue() == -1){ | |||||
| return new ResultData(ErrorCode.USER_PHONE_IS_FOUND); | |||||
| } | |||||
| user.setUserId(userBasicId); | user.setUserId(userBasicId); | ||||
| } | } | ||||
| wxCUserService.saveOrUpdate(user); | wxCUserService.saveOrUpdate(user); | ||||