Merge branch 'feature' into 'release'

聚合标题展示调整

See merge request !597

src/main/java/com/zhiwei/brandkbs2/controller/app/AppHotController.java

@@ -392,7 +392,7 @@ public class AppHotController extends BaseController {
         CompletableFuture.allOf(resultList.stream().map(json -> CompletableFuture.supplyAsync(() -> {
             try {
                 BaseMap firstArticle = markDataService.getFirstArticle(startDate.getTime(), endDate.getTime(), json.getString("title"), projectId, Constant.PRIMARY_CONTEND_ID, include);
-                json.put("title", firstArticle.getTitleNullOptionalContent());
+                json.put("showTitle", firstArticle.getTitleNullOptionalContent());
                 json.put("content", firstArticle.getContent());
                 json.put("url", firstArticle.getUrl());
                 json.put("realSource", firstArticle.getRealSource());

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -3497,7 +3497,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             CompletableFuture.allOf(markTopTitleList.stream().map(json -> CompletableFuture.supplyAsync(() -> {
                 try {
                     BaseMap firstArticle = getAnalyzeFirstArticle(dto, json.getString("title"));
-                    json.put("title", firstArticle.getTitleNullOptionalContent());
+                    json.put("showTitle", firstArticle.getTitleNullOptionalContent());
                     json.put("content", firstArticle.getContent());
                     json.put("url", firstArticle.getUrl());
                     json.put("realSource", firstArticle.getRealSource());

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -424,10 +424,9 @@ public class UserServiceImpl implements UserService {
         Query query = new Query(Criteria.where("superAdmin").is(false));
         userDao.addKeywordFuzz(query, keyword, "nickname");
         userDao.addSort(query, "{\"cTime\":\"descend\"}");
-        // roles总量
-        List<User> list = userDao.findList(new Query(Criteria.where("superAdmin").is(false)));
-        long count = list.stream().map(User::getRoles).filter(Objects::nonNull).mapToLong(Collection::size).sum();
         List<User> userList = userDao.findList(query);
+        // roles总量
+        long count = userList.stream().map(User::getRoles).filter(Objects::nonNull).mapToLong(Collection::size).sum();
         Map<User, List<UserRole>> userRolesMap = userList.stream().collect(Collectors.toMap(o -> o, User::getRoles));
         List<JSONObject> resList = new ArrayList<>();
         for (Map.Entry<User, List<UserRole>> entry : userRolesMap.entrySet()) {

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -80,7 +80,7 @@ public class Tools {
     /**
      * 须过滤的标题
      */
-    public static final List<String> FILTER_TITLE = Arrays.asList("Notitle", "分享一篇文章", "分享一篇文章。", "暂无标题", "", "No title");
+    public static final List<String> FILTER_TITLE = Arrays.asList("Notitle", "分享一篇文章", "分享一篇文章。", "暂无标题", "", "No title", "无题", "no title");
 
     /**
      * 须过滤的渠道