From cdaed0377f8aeabfa29650eb0bd6f162e4641985 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Wed, 11 Sep 2019 13:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/service/NewsService.java | 2 +- .../com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java | 2 +- .../epdc-news-server/src/main/resources/mapper/NewsDao.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index d200d5cb6..a13f7cac0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -121,5 +121,5 @@ public interface NewsService { * @author qushutong * @date 2019/9/11 9:22 */ - Result> listBanner( TokenDto userDetail); + Result> listBanner(TokenDto userDetail); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java index f7f4fb757..9d33656de 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java @@ -14,7 +14,7 @@ public class EpdcNewsListFromDTO implements Serializable { /** * 用户所属网格ID */ - @NotBlank(message = "用户网格ID不能为空") + @NotNull(message = "用户网格ID不能为空") private Long deptId; /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index 8aa30291b..93f36c748 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml @@ -64,7 +64,7 @@ AND en.NEWS_UP_DOWN_STATE = '0' AND en.DEL_FLAG = '0' ORDER BY - en.RELEASE_TIME DESC + en.NEWS_RELEASE_START_TIME DESC LIMIT #{pageIndex},#{pageSize}