diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 1a6f6d8c6..15b25f57c 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.supervise.service.impl; import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -235,10 +236,14 @@ public class ClassifyServiceImpl extends BaseServiceImpl classifyList = new ArrayList<>(); - List entityList = this.list(Wrappers.query().lambda() + LambdaQueryWrapper ne = Wrappers.query().lambda() .eq(ClassifyEntity::getPId, classifyEntity.getId()) - .in(ClassifyEntity::getExamineDeptId, Func.toLongList(deptId)) - .ne(ClassifyEntity::getPId, 0L) + .ne(ClassifyEntity::getPId, 0L); + if (Func.isNotBlank(deptId)){ + ne.in(ClassifyEntity::getExamineDeptId, Func.toLongList(deptId)); + + } + List entityList = this.list(ne ); for (ClassifyEntity entity : entityList) { ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);