From 393da6fc8e2a98ff057fa70d37ad7388352d5722 Mon Sep 17 00:00:00 2001
From: gupeng <gupeng@elink-cn.com>
Date: Fri, 29 Nov 2019 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=92=8Cbanner=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/elink/esua/epdc/dto/BannerDTO.java   |  7 ++++++-
 .../src/main/java/com/elink/esua/epdc/dto/NewsDTO.java |  7 ++++++-
 .../esua/epdc/service/impl/BannerServiceImpl.java      | 10 ++++++++--
 .../elink/esua/epdc/service/impl/NewsServiceImpl.java  | 10 ++++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java
index 836470f4e..faf9075da 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java
@@ -143,11 +143,16 @@ public class BannerDTO implements Serializable {
     /**
      * 所有部门
      */
-    private List<String> allDeptIds;
+    private String allDeptIds;
 
     /**
      * 所有部门名称
      */
     private String allDeptNames;
 
+    /**
+     * 所有部门列表
+     */
+    private List<String> allDeptIdsShow;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java
index ac9d32a15..133886a9f 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java
@@ -164,10 +164,15 @@ public class NewsDTO implements Serializable {
     /**
      * 所有部门
      */
-    private List<String> allDeptIds;
+    private String allDeptIds;
 
     /**
      * 所有部门名称
      */
     private String allDeptNames;
+
+    /**
+     * 所有部门列表
+     */
+    private List<String> allDeptIdsShow;
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
index 9dd90b2f7..e44258be0 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
@@ -94,7 +94,13 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
     @Override
     public BannerDTO get(String id) {
         BannerEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, BannerDTO.class);
+        BannerDTO dto = ConvertUtils.sourceToTarget(entity, BannerDTO.class);
+        if(StringUtils.isNotBlank(dto.getAllDeptIds())){
+            String[] idsShow = dto.getAllDeptIds().split(",");
+            List<String> ids = Arrays.asList(idsShow);
+            dto.setAllDeptIdsShow(ids.subList(1,ids.size()));
+        }
+        return dto;
     }
 
     @Override
@@ -109,7 +115,7 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         if (StringUtils.isBlank(dto.getId())) {
             entity.setState(YesOrNoEnum.NO.value());
         }
-        List<String> allDeptIds = dto.getAllDeptIds();
+        List<String> allDeptIds = dto.getAllDeptIdsShow();
         // bnner所属部门id
         Long bnnerDeptId = 0L;
         if(allDeptIds != null && allDeptIds.size() != 0){
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index 0ac7d475b..e27fd4468 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -130,7 +130,13 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Override
     public NewsDTO get(String id) {
         NewsEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, NewsDTO.class);
+        NewsDTO dto = ConvertUtils.sourceToTarget(entity, NewsDTO.class);
+        if(StringUtils.isNotBlank(dto.getAllDeptIds())){
+            String[] idsShow = dto.getAllDeptIds().split(",");
+            List<String> ids = Arrays.asList(idsShow);
+            dto.setAllDeptIdsShow(ids.subList(1,ids.size()));
+        }
+        return dto;
     }
 
     @Override
@@ -226,7 +232,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         } else {
             isSave = false;
         }
-        List<String> allDeptIds = newsDto.getAllDeptIds();
+        List<String> allDeptIds = newsDto.getAllDeptIdsShow();
         // 新闻所属部门id
         Long newsDeptId = 0L;
         if(allDeptIds != null && allDeptIds.size() != 0){