2022/9/20 14:27

src/main/java/com/zhiwei/brandkbs2/dao/impl/EventDataDaoImpl.java

@@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture;
 @Component("eventDataDao")
 public class EventDataDaoImpl extends BaseMongoDaoImpl<EventData> implements EventDataDao {
 
-    protected static final String COLLECTION_PREFIX = "brandkbs_event_data";
+    protected static final String COLLECTION_PREFIX = "brandkbs_event_data_";
     private static final String TIME_PATTERN = "yyyy";
 
     public EventDataDaoImpl() {

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

@@ -229,7 +229,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public AbstractProject getProjectByContendId(String projectId, String contendId) {
-        GlobalPojo.PROJECT_MAP.get(projectId)
+        Project project = GlobalPojo.PROJECT_MAP.get(projectId);
 //        Project project = projectDao.findOneById(projectId);
         if ("0".equals(contendId)) {
             return project;

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

@@ -109,9 +109,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public PageVO<JSONObject> findUserList(int page, int size, String keyword, String pid, int role) {
-        Criteria criteria = Criteria.where("roles.projectId").is(pid);
+        Criteria criteria = Criteria.where("roles.projectId").is(pid).and("superAdmin").is(false);
         if (-1 != role) {
-            criteria = criteria.andOperator(Criteria.where("roles.roleId").is(role).andOperator(Criteria.where("superAdmin").is(false)));
+            criteria = criteria.andOperator(Criteria.where("roles.roleId").is(role));
         }
         return findList(page, size, keyword, pid, new Query(criteria));
     }