From dc2a3fa8eac18b7e8e0e150fee29bb3c0aea58bc Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 23 Oct 2019 13:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E9=97=BB=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E5=80=99=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/NewsServiceImpl.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 4a590b804..46694dd64 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
@@ -207,7 +207,6 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         UserDetail user = SecurityUser.getUser();
         //是不是草稿箱
         entity.setNewsReleaseState(newsReleaseState);
-
         boolean isSave = true;
         if (StringUtils.isBlank(newsDto.getId())) {
             // 新增操作时，保存创建人，创建人部门信息。
@@ -240,6 +239,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         //草稿箱操作
         if (YesOrNoEnum.YES.value().equals(newsReleaseState)) {
             if (isSave) {
+                setNull(newsDto, entity);
                 insert(entity);
             } else {
                 entity.setUpdatedBy(user.getRealName());
@@ -255,6 +255,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
                 newsGridList = adminResult.getData();
             }
             if (isSave) {
+                setNull(newsDto, entity);
                 insert(entity);
             } else {
                 entity.setUpdatedBy(user.getRealName());
@@ -269,6 +270,17 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         }
     }
 
+    private void setNull(NewsDTO newsDto, NewsEntity entity) {
+        if(newsDto.getCommunityId()==null||StringUtils.isBlank(newsDto.getCommunity())||newsDto.getCommunityId()==0){
+            entity.setCommunity(null);
+            entity.setCommunityId(null);
+        }
+        if (newsDto.getGridId()==null||newsDto.getGridId()==0||StringUtils.isBlank(newsDto.getGrid())){
+            entity.setGridId(null);
+            entity.setGrid(null);
+        }
+    }
+
     @Override
     public Result<List<EpdcNewsListResultDTO>> listNews(EpdcNewsListFromDTO formDto) {