From ed589583bd652459bbca11f6059db92686235eb5 Mon Sep 17 00:00:00 2001
From: syc <asda>
Date: Wed, 3 Aug 2022 17:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ProjectController.java  | 2 +-
 .../java/com/epmet/service/impl/ProjectServiceImpl.java    | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index 180b00767e..89ad557e61 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -413,7 +413,7 @@ public class ProjectController {
         formDTO.setIsPage(false);
         ExcelWriter excelWriter = null;
         formDTO.setPageNo(NumConstant.ONE);
-        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        formDTO.setPageSize(NumConstant.ONE_THOUSAND);
         try {
             String fileName = "项目管理导出表" + DateUtils.format(new Date()) + ".xlsx";
             excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectListExcel.class).build();
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 3843668354..e8a73e8164 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -3473,7 +3473,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		//3-1.查询分类信息
 		IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO();
 		dictFormDto.setCustomerId(formDTO.getCustomerId());
-		Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto);
+		Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto);
 		if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) {
 			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常");
 		}
@@ -3507,10 +3507,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			}
 
 			if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) {
-				//String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),String.valueOf((char)10));
-				String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),"\n");
-				System.out.println(imageUrl
-				);
+				String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList())," <br/> ");
 				dto.setImageUrl(imageUrl);
 			}