From 52c9c02b473402cefb1f99a4036b10561e94eb30 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 23 Aug 2024 17:58:37 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A1=B9=E7=9B=AE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=88=97=E8=A1=A8=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index 4d7d76c..66d1f63 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -279,8 +279,10 @@ public class WorkbenchManage { Collectors.collectingAndThen(Collectors.toList(), w -> { Set sourceNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getSourceSystem); + int sourceCount = CollUtil.count(sourceNames, isValidSystem::test); Set targetNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getTargetSystem); - return Pair.create(sourceNames.size(), targetNames.size()); + int targetCount = CollUtil.count(targetNames, isValidSystem::test); + return Pair.create(sourceCount, targetCount); }))).values(); int totalTargetCount = 0; int totalSourceCount = 0; @@ -528,7 +530,7 @@ public class WorkbenchManage { .le(req.getReviewAmountMax() != null, Project::getReviewAmount, req.getReviewAmountMax()) // 下达金额 .ge(req.getApproveAmountMin() != null, Project::getApprovalAmount, req.getApproveAmountMin()) - .ge(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax()) + .le(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax()) .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) .eq(Project::getNewest, Boolean.TRUE) .orderByDesc(Project::getUpdateOn);