From f88147dcf5c2104cebf7d63f4d207264eb5c5eac Mon Sep 17 00:00:00 2001
From: gupeng <gupeng@elink-cn.com>
Date: Fri, 29 Nov 2019 18:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=A0=E5=85=A5=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BCid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/BannerServiceImpl.java   | 8 ++++++--
 .../com/elink/esua/epdc/service/impl/NewsServiceImpl.java | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

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 e44258be0..3a5220343 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
@@ -139,10 +139,14 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         }
         List<Long> bannerGridList = new ArrayList<>();
         Result<List<Long>> adminResult = adminFeignClient.listGridIdByDeptPid(bnnerDeptId);
-        if (!adminResult.success() || CollUtil.isEmpty(adminResult.getData())) {
+        if (!adminResult.success()) {
             throw new RenException("获取部门信息失败");
         }
-        bannerGridList = adminResult.getData();
+        if(CollUtil.isEmpty(adminResult.getData())){
+            bannerGridList.add(bnnerDeptId);
+        }else {
+            bannerGridList = adminResult.getData();
+        }
 
         boolean isSave = true;
         if (StringUtils.isNotBlank(dto.getId())) {
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 e27fd4468..b64d19276 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
@@ -270,10 +270,14 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         } else {
             if (CollUtil.isEmpty(newsGridList)) {
                 Result<List<Long>> adminResult = adminFeignClient.listGridIdByDeptPid(newsDeptId);
-                if (!adminResult.success() || CollUtil.isEmpty(adminResult.getData())) {
+                if (!adminResult.success()) {
                     throw new RenException("获取部门信息失败");
                 }
-                newsGridList = adminResult.getData();
+                if(CollUtil.isEmpty(adminResult.getData())) {
+                    newsGridList.add(newsDeptId);
+                }else {
+                    newsGridList = adminResult.getData();
+                }
             }
             if (isSave) {
                 // setNull(newsDto, entity);