From f36a097b79fa816114a99f3d7bbf0fbb643c0a69 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 10 Sep 2019 14:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/NewsServiceImpl.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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 954bab717..668cebb0c 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
@@ -67,9 +67,6 @@ import java.util.Map;
 @Service
 public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implements NewsService {
 
-    @Autowired
-    private NewsRedis newsRedis;
-
     @Autowired
     private NewsDepartmentService newsDepartmentService;
 
@@ -114,9 +111,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         wrapper.eq(StringUtils.isNotBlank(keyword), "NEWS_TITLE", keyword);
         //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
         if (StringUtils.isNotEmpty(draft)) {
-            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "1");
+            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value());
         } else {
-            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "0");
+            wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value());
         }
         wrapper.orderByDesc("CREATED_TIME");
         return wrapper;
@@ -174,7 +171,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         String onLineState = parmas.get("onLineState");
         NewsDTO newsDTO = get(id);
         //判断下是不是上线 是的话才执行
-        if ("1".equals(newsDTO.getNewsUpDownState())) {
+        if (YesOrNoEnum.YES.value().equals(newsDTO.getNewsUpDownState())) {
             newsDTO.setNewsUpDownState(onLineState);
             NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
             updateById(entity);
@@ -241,7 +238,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
                     throw new RenException("获取部门信息失败");
                 }
                 newsGridList = adminResult.getData();
-            }else {
+            } else {
             }
             if (isSave) {
                 insert(entity);
@@ -277,6 +274,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result modifyStatement(EpdcNewsStatementFromDTO statementFromDto) {
         NewsDTO newsDto = get(statementFromDto.getNewsId());