diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 41b9702b5d..d87eecde2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/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> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true); Map result = new HashMap<>(); result.put("total",maps.getPages()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index ee5ee06177..f22a744046 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/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(exportResiUserFormDTO.getCustomerId()); - }else{ - searchForm.setCustomerId(tokenDto.getCustomerId()); - } - + searchForm.setCustomerId(tokenDto.getCustomerId()); searchForm.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(searchForm, IcResiUserPageFormDTO.AddUserInternalGroup.class); }