--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -365,18 +365,19 @@ public class FgPermissionsController {
 			if (StringUtils.isBlank(m.getPhone()) && StringUtils.isNotBlank(form.getPhone())) {
 				m.setPhone(form.getPhone());
 			}
-			if (!mService.updateByPrimaryKeySelective(m)) {
+			if(StringUtils.isNotBlank(m.getPhone()) && StringUtils.isNotBlank(form.getPhone()) && !m.getPhone().equals(form.getPhone())){
+				m.setPhone(form.getPhone());
+			}
+			if(!mService.updateByPrimaryKeySelective(m)) {
 				throw new BaseException("绑定手机号失败！");
 			}
 			info = mService.isLevelLogin(m);
 			String token = MD5Util.getEncoderByMd5(m.getAccount());
 			info.setToken(token);
 			redis.set(token, info);
-
-			llService.save(info.getAccount(), CusAccessObjectUtil.getIpAddress(request), 1, form.getChannel(),
-					"微信小程序绑定第三方账号并登录");
-		} else {
-			if (StringUtils.isNoneBlank(form.getPhone())) {
+			llService.save(info.getAccount(), CusAccessObjectUtil.getIpAddress(request), 1, form.getChannel(), "微信小程序绑定第三方账号并登录");
+		}else{
+			if(StringUtils.isNotBlank(form.getPhone())){
 				m = mService.loginPhone(form.getPhone());
 			}
 			if (m != null) {
@@ -387,7 +388,10 @@ public class FgPermissionsController {
 				if (StringUtils.isBlank(m.getWechatKey()) && StringUtils.isNotBlank(form.getWechatKey())) {
 					m.setWechatKey(form.getWechatKey());
 				}
-				if (!mService.updateByPrimaryKeySelective(m)) {
+				if(StringUtils.isNotBlank(m.getWechatKey()) && StringUtils.isNotBlank(form.getWechatKey()) && !m.getPhone().equals(form.getPhone())){
+					m.setPhone(form.getWechatKey());
+				}
+				if(!mService.updateByPrimaryKeySelective(m)) {
 					throw new BaseException("绑定微信或QQ失败！");
 				}
 				info = mService.isLevelLogin(m);