|
@@ -249,9 +249,9 @@ public class AppLoginController extends AppBaseController{
|
|
|
FsUser user = findUserByPhone(param.getPhone());
|
|
|
if (user!=null && StringUtils.isEmpty(user.getUnionId())){
|
|
|
FsUser userByUnionId = userMapper.selectFsUserByUnionid(unionid);
|
|
|
- if (userByUnionId!=null){
|
|
|
- return R.error("该微信已绑定其他用户,请勿重复绑定!");
|
|
|
- }
|
|
|
+// if (userByUnionId!=null){
|
|
|
+// return R.error("该微信已绑定其他用户,请勿重复绑定!");
|
|
|
+// }
|
|
|
user.setSource(param.getSource() != null ? param.getSource() : null );
|
|
|
user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
|
user.setNickName(nickname);
|
|
@@ -260,9 +260,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
user.setUnionId(unionid);
|
|
|
if (userService.updateFsUser(user)>0){
|
|
|
return generateTokenAndReturn(user);
|
|
|
- }else {
|
|
|
- return R.error("绑定微信失败");
|
|
|
}
|
|
|
+// else {
|
|
|
+// return R.error("绑定微信失败");
|
|
|
+// }
|
|
|
}
|
|
|
return R.error("数据参数异常!");
|
|
|
}catch (Exception e){
|