全周期档案删除白蚁的数据
parent
f40ce2c99b
commit
a0cb7a87c4
|
|
@ -152,11 +152,11 @@ public class ProjectEventsService extends ServiceImpl<ProjectEventsMapper, Proje
|
||||||
List<ProjectEventsVo> projectEventsVos = this.baseMapper.reinforceList(page);
|
List<ProjectEventsVo> projectEventsVos = this.baseMapper.reinforceList(page);
|
||||||
list.addAll(projectEventsVos);
|
list.addAll(projectEventsVos);
|
||||||
}
|
}
|
||||||
if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(6)){
|
// if(CollectionUtils.isEmpty(types) || (CollectionUtils.isNotEmpty(types)) && types.contains(6)){
|
||||||
List<TermiteSurvey> termiteVos = this.baseMapper.termiteList(page);
|
// List<TermiteSurvey> termiteVos = this.baseMapper.termiteList(page);
|
||||||
List<ProjectEventsVo> projectEventsVos = this.handelTermite(termiteVos);
|
// List<ProjectEventsVo> projectEventsVos = this.handelTermite(termiteVos);
|
||||||
list.addAll(projectEventsVos);
|
// list.addAll(projectEventsVos);
|
||||||
}
|
// }
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue