Merge branch 'master-chw-bug' into dev-chw

# Conflicts:
#	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/ArticleAdminController.java

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

@@ -32,17 +32,17 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     private final Integer HOME_PAGE_NUMBER = 4;
 
 
-
-
     /**
-     * 文章列表
-     *
+     * 资讯列表
      * @param page
      * @param limit
      * @param type
+     * @param title
+     * @param typeId
+     * @param flag 是否过滤未启用数据
      * @return
      */
-    public PageInfo getArticleList(Integer page, Integer limit, Integer type,String title, Integer typeId) {
+    public PageInfo getArticleList(Integer page, Integer limit, Integer type,String title, Integer typeId, boolean flag) {
         PageHelper.startPage(page, limit);
         Example example = new Example(Article.class);
         Example.Criteria criteria = example.createCriteria();
@@ -56,7 +56,9 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
             criteria.andEqualTo("typeId", typeId);
         }
         criteria.andEqualTo("isDel", 0);
+       if (flag) {
            criteria.andEqualTo("status", 1);
+       }
         example.orderBy("weight").asc();
         return PageInfo.of(mapper.selectByExample(example));
     }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/ArticleController.java

@@ -28,7 +28,7 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
             @RequestParam(name = "type", defaultValue = "1") Integer type,
             @RequestParam(value = "title",required = false) String title,
             @RequestParam(value = "typeId",required = false) Integer typeId) {
-        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId));
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId, true));
     }
 
     @GetMapping("/app/unauth/one")

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/ArticleAdminController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"文章"})
 public class ArticleAdminController extends BaseController<ArticleBiz, Article> {
 
-    @GetMapping("/list")
+    @GetMapping("list")
     @ApiOperation(value = "获取文章列表")
     public ObjectRestResponse getArticleList(
             @RequestParam(name = "page", defaultValue = "1") Integer page,
@@ -28,7 +28,7 @@ public class ArticleAdminController extends BaseController<ArticleBiz, Article>
             @RequestParam(name = "type", defaultValue = "1") Integer type,
             @RequestParam(value = "title",required = false) String title,
             @RequestParam(value = "typeId",required = false) Integer typeId) {
-        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId));
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId, false));
     }
 
     @GetMapping("/app/unauth/one")