PDA考核指标项调整

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<ClassifyMapper, Classif
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)) {
 				List<ClassifyApiVO> classifyList = new ArrayList<>();
-				List<ClassifyEntity> entityList = this.list(Wrappers.<ClassifyEntity>query().lambda()
+				LambdaQueryWrapper<ClassifyEntity> ne = Wrappers.<ClassifyEntity>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<ClassifyEntity> entityList = this.list(ne
 				);
 				for (ClassifyEntity entity : entityList) {
 					ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);