Merge branch 'bug-fix-0929' into 'master'

Bug fix 0929

See merge request !9

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -13,10 +13,7 @@ import cn.quantgroup.xyqb.entity.UserAttached;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.exception.UserNotExistException;
 import cn.quantgroup.xyqb.exception.VerificationCodeErrorException;
-import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.model.LoginProperties;
-import cn.quantgroup.xyqb.model.UserBrief;
-import cn.quantgroup.xyqb.model.UserModel;
+import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
@@ -535,7 +532,11 @@ public class UserController implements IBaseController {
             return JsonResult.buildErrorStateResult("登录时微信关联失败", null);
         }
         LoginProperties loginProperties = new LoginProperties("", 1, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName());
-        return new JsonResult(sessionService.createSession(user, loginProperties));
+        AuthBean authBean=sessionService.createSession(user, loginProperties);
+        if(authBean!=null){
+            authBean.setRegister(false);
+        }
+        return new JsonResult(authBean);
     }
 
     private User verificateUserNameAndPassword(HttpServletRequest request) {