Merge branch 'release' into 'master'

Release

See merge request !304

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

@@ -193,6 +193,7 @@ public class BehaviorServiceImpl implements BehaviorService {
         if (StringUtils.isNotEmpty(nickname)) {
             userDao.addKeywordFuzz(query, nickname, "nickname");
         }
+        long count = userLogRecordDao.count(query, collectionNames);
         List<UserLogRecord> behaviorList = new ArrayList<>();
         int pageSizeFlag = size;
         int skipCount = (page - 1) * size;
@@ -210,7 +211,6 @@ public class BehaviorServiceImpl implements BehaviorService {
                 pageSizeFlag = size - behaviorList.size();
             }
         }
-        long count = userLogRecordDao.count(query);
         return PageVO.createPageVo(count, page, size, behaviorList);
     }