|
@@ -101,7 +101,7 @@ public class WxH5MpController {
|
|
|
WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
|
|
|
|
|
|
// 处理用户信息
|
|
|
- FsUser user = processUserInfo(wxMpUser, company,companyUser);
|
|
|
+ FsUser user = processUserInfo(wxMpUser, company,companyUser,param);
|
|
|
|
|
|
// 处理用户与公司的关系
|
|
|
processUserCompanyRelationship(user, param, companyUser, company);
|
|
@@ -120,7 +120,7 @@ public class WxH5MpController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private FsUser processUserInfo(WxOAuth2UserInfo wxMpUser, Company company,CompanyUser companyUser) {
|
|
|
+ private FsUser processUserInfo(WxOAuth2UserInfo wxMpUser, Company company,CompanyUser companyUser,FsUserLoginByMpParam param) {
|
|
|
FsUser user = userService.selectFsUserByUnionId(wxMpUser.getUnionId());
|
|
|
|
|
|
if (user != null) {
|
|
@@ -147,6 +147,11 @@ public class WxH5MpController {
|
|
|
newUser.setCreateTime(new Date());
|
|
|
newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
|
|
|
userService.insertFsUser(newUser);
|
|
|
+ if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
|
|
|
+ && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
|
|
|
+ int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
|
|
|
+ userCompanyUserService.bindRelationship(newUser.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
|
|
|
+ }
|
|
|
return newUser;
|
|
|
}
|
|
|
}
|