导出居民信息 获取数据提出2

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -582,10 +582,10 @@ public class IcResiUserController implements ResultDataResolver {
             IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
             exportTemplateSaveFormDTO.setFormCode("resi_base_info");
             exportTemplateSaveFormDTO.setIsSaveTemp(false);
-            //固定通用客户Id
-            pageFormDTO.setCustomerId("jmreport_resi_default");
             pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
         }
+        //固定通用客户Id
+        pageFormDTO.setCustomerId("jmreport_resi_default");
         Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
         Map<String,Object> result = new HashMap<>();
         result.put("total",maps.getPages());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -244,12 +244,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
      */
     public void validateSearchForm(TokenDto tokenDto, ExportResiUserFormDTO exportResiUserFormDTO) {
         IcResiUserPageFormDTO searchForm = exportResiUserFormDTO.getSearchForm();
-        if (StringUtils.isNotBlank(exportResiUserFormDTO.getCustomerId())){
+        searchForm.setCustomerId(tokenDto.getCustomerId());
-            searchForm.setCustomerId(exportResiUserFormDTO.getCustomerId());
-        }else{
-            searchForm.setCustomerId(tokenDto.getCustomerId());
-        }
-
         searchForm.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(searchForm, IcResiUserPageFormDTO.AddUserInternalGroup.class);
     }