remove phone_no column

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -449,15 +449,19 @@ public class UserController implements IBaseController {
     public JsonResult associateWithWechat(String openId, String phoneNo) {
         User user = getCurrentUser();
         Long userId = user.getId();
-            WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(phoneNo);
-            if(wechatUserInfo != null) {
-                return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
-            }
-            WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
-            //限制微信用户和xyqb用户为一对一的关系
-            if (userInfo != null) {
-                userInfo.setUserId(userId);
-                userInfo.setPhoneNo(phoneNo);
+        User xyqbUser = userService.findByPhoneInDb(phoneNo);
+        WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(phoneNo);
+        if (wechatUserInfo != null) {
+            return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
+        }
+        if(xyqbUser != null && xyqbUser.getPhoneNo() != wechatUserInfo.getPhoneNo()) {
+            return JsonResult.buildErrorStateResult("该手机号已绑定其他微信号码", null);
+        }
+        WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
+        //限制微信用户和xyqb用户为一对一的关系
+        if (userInfo != null) {
+            userInfo.setUserId(userId);
+            userInfo.setPhoneNo(phoneNo);
             wechatService.saveWechatUserInfo(userInfo);
         }
         return JsonResult.buildSuccessResult(null, null);