Browse Source

删除自动设置组织管理员功能

origin/dept_screen
Jackwang 4 years ago
parent
commit
5ade76cf21
  1. 10
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java
  2. 6
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java
  3. 5
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

10
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java

@ -2,7 +2,6 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback;
import com.elink.esua.epdc.volunteer.*;
import org.springframework.cloud.openfeign.FeignClient;
@ -155,13 +154,4 @@ public interface AppVolunteerRankFeignClient {
@GetMapping(value = "heart/volunteer/getVolunteerList", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getVolunteerList(AppVorgFormDTO formDto);
/**
* @describe: 小程序完善居民信息-检查是否为志愿组织管理员
* @author wangtong
* @date 2021/9/29 9:04
* @params [user]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping(value = "heart/volunteer/setAppOrgAdminUser", consumes = MediaType.APPLICATION_JSON_VALUE)
Result setAppOrgAdminUser(UserDTO user);
}

6
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java

@ -3,7 +3,6 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
import com.elink.esua.epdc.volunteer.*;
import org.springframework.stereotype.Component;
@ -67,11 +66,6 @@ public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeig
return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerList",formDto);
}
@Override
public Result setAppOrgAdminUser(UserDTO user) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "setAppOrgAdminUser",user);
}
@Override
public Result applyActivity(AppVactApplyDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "applyActivity",formDto);

5
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -921,7 +921,6 @@ public class AppUserServiceImpl implements AppUserService {
// 党员认证失败
if (100006001 == completeResult.getCode()) {
setAppOrgAdminUser(user);
authorizationDto.setResultCode(YesOrNoEnum.YES.value());
authorizationDto.setResultMsg(completeResult.getMsg());
return new Result().ok(authorizationDto);
@ -931,13 +930,9 @@ public class AppUserServiceImpl implements AppUserService {
if (partyFlag) {
initPartyGroupInfo(cachingUserInfoDTO);
}
setAppOrgAdminUser(user);
return new Result().ok(authorizationDto);
}
private void setAppOrgAdminUser(UserDTO user){
appVolunteerRankFeignClient.setAppOrgAdminUser(user);
}
private EpdcAppAuthorizationDTO cachingUserInfoForAuthorization(CachingUserInfoDTO cachingUserInfo, String userGrid, String userState) {

Loading…
Cancel
Save