diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java index aee8c11a2..69d8f149f 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java @@ -145,7 +145,7 @@ public class BannerDTO implements Serializable { private String creatorName; /*** - * banner位置 + * banner位置,0顶部;1中间 */ private String position; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java index 9576ecc6b..7fc2af146 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java @@ -15,7 +15,10 @@ import java.io.Serializable; public class EpdcBannerListFromDTO implements Serializable { private static final long serialVersionUID = -178835849989066589L; - @NotBlank(message = "新闻位置不能为空") + /** + * banner位置,0顶部;1中间 + */ + @NotBlank(message = "banner位置不能为空") private String position; /** * 网格ID diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java index 0301f328d..d2490bb0e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java @@ -114,7 +114,7 @@ public class BannerEntity extends BaseEpdcEntity { private String creatorName; /*** - * banner位置 + * banner位置,0顶部;1中间 */ private String position; 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 7733a03bf..2e633e6db 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 @@ -391,8 +391,11 @@ public class NewsServiceImpl extends BaseServiceImpl implem banner.setImgUrl(newsEntity.getNewsImageUrl()); banner.setNewsFlag(YesOrNoEnum.YES.value()); banner.setNewsId(newsId); - banner.setBannerType(NumConstant.TWO_STR); banner.setTitle(newsEntity.getNewsTitle()); + // 数据字典值,2-新闻类型 + banner.setBannerType(NumConstant.TWO_STR); + // banner位置,0顶部;1中间 + banner.setPosition(NumConstant.ZERO_STR); this.bannerService.saveNewsToBanner(banner, deptIds); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index c2593aca1..5eeea83c2 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -72,9 +72,13 @@ public class NoticeServiceImpl extends BaseServiceImpl @Override public PageData page(Map params) { + + QueryWrapper wrapper = this.getWrapper(params) + .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId()); + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) + wrapper ); return getPageData(page, NoticeDTO.class); } @@ -87,16 +91,12 @@ public class NoticeServiceImpl extends BaseServiceImpl } private QueryWrapper getWrapper(Map params) { - UserDetail user = SecurityUser.getUser(); - //部门ID列表 - List deptIdList = user.getDeptIdList(); String id = (String) params.get(FieldConstant.ID_HUMP); String noticeTitle = (String) params.get("noticeTitle"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) .like(StringUtils.isNotBlank(noticeTitle), "NOTICE_TITLE", noticeTitle); - wrapper.in(CollUtil.isNotEmpty(deptIdList),"GRID_ID",deptIdList); return wrapper; }