--no commit message

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

@@ -363,11 +363,16 @@ public class FgPermissionsController {
 				throw new BaseException(5, "该账户已禁用");
 			}
 			if (StringUtils.isBlank(m.getPhone()) && StringUtils.isNotBlank(form.getPhone())) {
-				m.setPhone(form.getPhone());
+				Example example = mService.createExample();
+				example.createCriteria().andEqualTo("phone", form.getPhone());
+				if (mService.selectCountByExample(example) == 0) {
+					m.setPhone(form.getPhone());
+				}
+				// throw new BaseException(15, "该手机号已被注册");
 			}
-			if(StringUtils.isNotBlank(m.getPhone()) && StringUtils.isNotBlank(form.getPhone()) && !m.getPhone().equals(form.getPhone())){
+			/*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("绑定手机号失败！");
 			}
@@ -389,7 +394,7 @@ public class FgPermissionsController {
 					m.setWechatKey(form.getWechatKey());
 				}
 				if(StringUtils.isNotBlank(m.getWechatKey()) && StringUtils.isNotBlank(form.getWechatKey()) && !m.getPhone().equals(form.getPhone())){
-					m.setPhone(form.getWechatKey());
+					m.setWechatKey(form.getWechatKey());
 				}
 				if(!mService.updateByPrimaryKeySelective(m)) {
 					throw new BaseException("绑定微信或QQ失败！");