|
|
|
@ -327,7 +327,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); |
|
|
|
|
|
|
|
// 网格长加入网格党员群并设置为群主
|
|
|
|
this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR); |
|
|
|
// this.joinGridPartyGroup(newAppUser, userGridList, NumConstant.ONE_STR);
|
|
|
|
|
|
|
|
return new Result().ok(authorization); |
|
|
|
} |
|
|
|
@ -754,11 +754,11 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
userResult = registerBindGridResultDto.getData(); |
|
|
|
registeredUser = userResult.getUserDTO(); |
|
|
|
// 用户已认证为党员,绑定网格时加入该网格党员群
|
|
|
|
if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { |
|
|
|
/*if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { |
|
|
|
UserGridRelationDTO userGridRelationDto = new UserGridRelationDTO(); |
|
|
|
userGridRelationDto.setGridId(userResult.getGridId()); |
|
|
|
this.joinGridPartyGroup(registeredUser, Collections.singletonList(userGridRelationDto), NumConstant.ZERO_STR); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
|
|
|
|
// 已注册已绑定当前网格
|
|
|
|
@ -863,7 +863,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState()); |
|
|
|
|
|
|
|
// 更新社群用户党员标识并加入关联的所有网格党员群
|
|
|
|
if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { |
|
|
|
/*if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { |
|
|
|
GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); |
|
|
|
formDto.setUserId(user.getId()); |
|
|
|
formDto.setPartyMember(user.getPartyFlag()); |
|
|
|
@ -875,7 +875,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
|
|
|
|
groupFeignClient.updateUserPartyMember(formDto); |
|
|
|
// groupTask.updateUserPartyMember(formDto);
|
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
return new Result().ok(authorizationDto); |
|
|
|
} |
|
|
|
|