diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 48ea9b69..283b96c7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -68,18 +68,22 @@ public class ArticleServiceImpl implements IArticleService{ @Override public List
articelList(Integer type) { + OrderCondition oc=OrderCondition.desc("sysCreateTime"); + if(type==2){ + oc=OrderCondition.desc("views"); + } //先查出带有图片的 List
articles = new ArrayList<>(); - Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), +// Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), +// FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); +// articles.add(article); + List
tops =dao.findList(1, oc, null,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); - articles.add(article); - + articles.add(tops.get(0)); + QueryBuilder builder = QueryBuilder.from(Article.class); - if(type==2){ - builder.addOrder(OrderCondition.desc("views")); - }else{ - builder.addOrder(OrderCondition.desc("sysCreateTime")); - } + + builder.addOrder(oc); builder.addFilter(FieldFilters.eq("status", Article.STATUS_PUBLISH)); builder.addFilter(FieldFilters.eq("enabled",true)); builder.addFilter(FieldFilters.eq("deleted",false)); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java index 517676d1..48b43343 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java @@ -31,7 +31,6 @@ public class SysManagerApi extends ApiBaseController { /** * 分页查询 - * * @return */ @PostMapping("/page") @@ -47,7 +46,6 @@ public class SysManagerApi extends ApiBaseController { /** * 保存 - * * @param sysManager * @return */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java new file mode 100644 index 00000000..5d5ee1f7 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java @@ -0,0 +1,39 @@ +package com.xboe.system.user.vo; + +import java.util.List; + +import lombok.Data; + +/** + * 批量消息 + * + */ +@Data +public class BatchMessage { + + /** + * 提交人id + */ + private List acceptIds; + + private List acceptNames; + + private String refId; + + private String refType; + + private Integer pageType; + + /** + * 页面参数 默认是id + */ + private String pageParams; + + private String sendName; + + private String sendAid; + + private Integer sendType; + + private String title; +}