Merge branch 'feature' into 'release'

用户行为列表查询增加项目限制

See merge request !178

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

 package com.zhiwei.brandkbs2.service.impl;
 
+import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 import com.zhiwei.brandkbs2.dao.BehaviorDao;
 import com.zhiwei.brandkbs2.dao.UserDao;
 import com.zhiwei.brandkbs2.easyexcel.dto.ExportBehaviorDTO;
@@ -71,11 +72,13 @@ public class BehaviorServiceImpl implements BehaviorService {
 
     @Override
     public PageVO<BehaviorVO> findBehaviorList(int page, int size, long startTime, long endTime, boolean backstage, String nickname) {
+        String projectId = UserThreadLocal.getProjectId();
         Date start = new Date(startTime);
         Date end = new Date(endTime);
         String[] collectionNames = behaviorDao.generateCollectionNames(start, end);
         Query query = new Query();
         query.addCriteria(Criteria.where("cTime").gte(startTime).lt(endTime).and("backstage").is(backstage));
+        query.addCriteria(Criteria.where("projectId").is(projectId));
         behaviorDao.addSort(query, "{\"cTime\":\"descend\"}");
         if (StringUtils.isNotEmpty(nickname)) {
             Query userQuery = new Query();