在职党员报道，增加查询报道信息feign接口；

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -4,8 +4,6 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -436,6 +434,11 @@ public class ApiAppUserController {
         return appUserService.saveReportparty(dto);
     }
 
+    @PostMapping("/reportparty/getByIdCardAndName")
+    public Result getByIdCardAndName(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
+        return appUserService.getByIdCardAndName(dto);
+    }
+
     /**
      * 红色尖兵
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -508,6 +508,15 @@ public interface UserFeignClient {
     @PostMapping("/app-user/reportparty/save")
     Result saveReportparty(ReportPartyDTO dto);
 
+    /**
+     * 获取在职党员报到信息
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/reportparty/getByIdCardAndName")
+    Result getByIdCardAndName(ReportPartyDTO dto);
+
     /**
      * 红色尖兵
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -267,6 +267,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto);
     }
 
+    @Override
+    public Result getByIdCardAndName(ReportPartyDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getByIdCardAndName", dto);
+    }
+
     @Override
     public Result saveRedspearhead(RedSpearheadDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveRedspearhead", dto);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -396,4 +396,6 @@ public interface AppUserService {
     Result<EpdcAppRegisterCallbackDTO> npmUserRegister(EpdcUserNpmRegisterFormDTO formDto);
 
     Result<String> npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto);
+
+    Result getByIdCardAndName(ReportPartyDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1636,6 +1636,11 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.saveReportparty(dto);
     }
 
+    @Override
+    public Result getByIdCardAndName(ReportPartyDTO dto) {
+        return userFeignClient.getByIdCardAndName(dto);
+    }
+
     @Override
     public Result saveRedspearhead(RedSpearheadDTO dto) {
         return userFeignClient.saveRedspearhead(dto);
@@ -1701,7 +1706,7 @@ public class AppUserServiceImpl implements AppUserService {
         userDTO.setWorkType(formDto.getWorkType());
         userDTO.setWorkIndustry(formDto.getWorkIndustry());
         userDTO.setWorkIndustryText(formDto.getWorkIndustryText());
-        if(StringUtils.isNotEmpty(formDto.getFaceImg())){
+        if (StringUtils.isNotEmpty(formDto.getFaceImg())) {
             userDTO.setFaceImg(formDto.getFaceImg());
         }
         // IP地址