修改bug

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -258,6 +258,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
             } else {
                 entity.setUpdatedBy(user.getRealName());
                 entity.setUpdatedTime(new Date());
+                entity.setCreatedTime(new Date());
                 this.baseDao.updateNewsById(entity);
                 newsDepartmentService.deleteByNewsId(entity.getId());
             }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

@@ -31,6 +31,7 @@
             ed.DEPT_ID = #{deptId}
         AND en.NEWS_RELEASE_START_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
         AND en.NEWS_RELEASE_END_TIME >= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+        AND en.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
         AND en.NEWS_RELEASE_STATE = '0'
         AND en.NEWS_UP_DOWN_STATE = '0'
         AND en.DEL_FLAG = '0'
@@ -79,7 +80,9 @@
             grid = #{grid},
             grid_id = #{gridId},
             updated_by = #{updatedBy},
-            updated_time = #{updatedTime}
+            updated_time = #{updatedTime},
+            news_release_state = #{newsReleaseState},
+            created_time = #{createdTime}
         WHERE id = #{id} AND del_flag = '0';
     </update>
 </mapper>

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -18,6 +18,7 @@
         WHERE
             nd.DEPT_ID = #{deptId}
             AND en.RELEASE_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+            AND en.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
             AND en.DEL_FLAG = '0'
         ORDER BY
             en.RELEASE_TIME DESC