diff --git a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java index 9652b19..1162267 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java @@ -152,11 +152,11 @@ public class ProjectEventsService extends ServiceImpl projectEventsVos = this.baseMapper.reinforceList(page); list.addAll(projectEventsVos); } - if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(6)){ - List termiteVos = this.baseMapper.termiteList(page); - List projectEventsVos = this.handelTermite(termiteVos); - list.addAll(projectEventsVos); - } +// if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(6)){ +// List termiteVos = this.baseMapper.termiteList(page); +// List projectEventsVos = this.handelTermite(termiteVos); +// list.addAll(projectEventsVos); +// } return list; }