From b104d1ffd047870f4ad9e68e0482027b2622f273 Mon Sep 17 00:00:00 2001
From: yangshaoping <123456>
Date: Thu, 19 Mar 2020 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E9=85=8D=E7=BD=AE=E7=9A=84=E8=AE=BE=E8=AE=A1=E7=A8=BF?=
 =?UTF-8?q?--=E8=BF=94=E5=9B=9E3=E4=B8=AA=E5=AF=B9=E8=B1=A1=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA3=E4=B8=AA=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/HomeDesignByCustomerResultDTO.java  |  6 +++---
 .../epmet/service/impl/HomeServiceImpl.java    | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
index 2ccebf420c..64dbfdaa26 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
@@ -17,11 +17,11 @@ public class HomeDesignByCustomerResultDTO implements Serializable {
 	/**
 	 * 标题区
 	 */
-	private CommonComponentDesignResultDTO titleList;
+	private List<CommonComponentDesignResultDTO> titleList;
 	/**
 	 * 置顶区
 	 */
-	private CommonComponentDesignResultDTO topList;
+	private List<CommonComponentDesignResultDTO> topList;
 	/**
 	 * 功能区
 	 */
@@ -29,7 +29,7 @@ public class HomeDesignByCustomerResultDTO implements Serializable {
 	/**
 	 * 悬浮区
 	 */
-	private CommonComponentDesignResultDTO floatingList;
+	private List<CommonComponentDesignResultDTO> floatingList;
 	/**
 	 *用于标识已使用的功能组件id列表（不含通用组件）
 	 */
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
index b0edee660e..9d936c031e 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
@@ -48,22 +48,28 @@ public class HomeServiceImpl implements HomeService {
         HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
         //根据客户id,所属端获取客户首页配置的设计稿
         List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO);
-        List<CommonComponentDesignResultDTO> flist=new ArrayList<CommonComponentDesignResultDTO>();//功能组件列表
+        List<CommonComponentDesignResultDTO> titlelist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<CommonComponentDesignResultDTO> toplist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<CommonComponentDesignResultDTO> functionlist=new ArrayList<CommonComponentDesignResultDTO>();
+        List<CommonComponentDesignResultDTO> floatlist=new ArrayList<CommonComponentDesignResultDTO>();
         List<String> usedComponent=new ArrayList<>();//使用过的组件集合
         for(CommonComponentDesignResultDTO c:list){
             usedComponent.add(c.getComponentId());
             //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
             if(ReginConstant.titleList.equals(c.getRegion())){
-                resultDTO.setTitleList(c);
+                titlelist.add(c);
             }else if(ReginConstant.topList.equals(c.getRegion())){
-                resultDTO.setTopList(c);
+                toplist.add(c);
             }else if(ReginConstant.functionList.equals(c.getRegion())){
-                flist.add(c);
+                functionlist.add(c);
             }else if(ReginConstant.floatingList.equals(c.getRegion())){
-                resultDTO.setFloatingList(c);
+                floatlist.add(c);
             }
         }
-        resultDTO.setFunctionList(flist);
+        resultDTO.setTitleList(titlelist);
+        resultDTO.setTopList(toplist);
+        resultDTO.setFloatingList(floatlist);
+        resultDTO.setFunctionList(functionlist);
         resultDTO.setUsedComponentIdList(usedComponent);
         return new Result<HomeDesignByCustomerResultDTO>().ok(resultDTO);
     }