|
@@ -101,7 +101,7 @@ public class WxH5MpController {
|
|
|
WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
|
|
|
|
|
|
// 处理用户信息
|
|
|
- FsUser user = processUserInfo(wxMpUser, company);
|
|
|
+ FsUser user = processUserInfo(wxMpUser, company,companyUser);
|
|
|
|
|
|
// 处理用户与公司的关系
|
|
|
processUserCompanyRelationship(user, param, companyUser, company);
|
|
@@ -120,7 +120,7 @@ public class WxH5MpController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private FsUser processUserInfo(WxOAuth2UserInfo wxMpUser, Company company) {
|
|
|
+ private FsUser processUserInfo(WxOAuth2UserInfo wxMpUser, Company company,CompanyUser companyUser) {
|
|
|
FsUser user = userService.selectFsUserByUnionId(wxMpUser.getUnionId());
|
|
|
|
|
|
if (user != null) {
|
|
@@ -141,6 +141,8 @@ public class WxH5MpController {
|
|
|
newUser.setAvatar(wxMpUser.getHeadImgUrl());
|
|
|
newUser.setStatus(1);
|
|
|
newUser.setMpOpenId(wxMpUser.getOpenid());
|
|
|
+ newUser.setCompanyId(company.getCompanyId());
|
|
|
+ newUser.setCompanyUserId(companyUser.getUserId());
|
|
|
newUser.setUnionId(wxMpUser.getUnionId());
|
|
|
newUser.setCreateTime(new Date());
|
|
|
newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
|