From cc2cb76438a3eaa8561657e51cd412c074362c44 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Dec 2023 17:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/controller/ParamsCollectManifestEOController.java  | 3 ++-
 .../service/impl/ParamsCollectManifestEOServiceImpl.java       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 2598f051d..2bbd9f6f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -731,7 +731,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 
 	@ApiOperation(value="催办", notes="催办")
 	@PostMapping(value = "/urge")
-	public void urge(@RequestBody Map<String,Object> map){
+	public Result<?> urge(@RequestBody Map<String,Object> map){
 		String ids = (String)map.get("ids");
 		String projectId = (String)map.get("projectId");
 		String title = (String)map.get("title");
@@ -739,6 +739,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		String projectVersion = (String)map.get("projectVersion");
 		String paramsManifestId = (String)map.get("paramsManifestId");
 		paramsCollectManifestEOService.urge(ids,projectId,title,inventoryVersion,projectVersion,paramsManifestId);
+		return Result.OK("催办成功");
 	}
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 4d9002eaf..c579b937b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -8147,7 +8147,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         //最新的截止时间
         List<Date> deadlineList = paramsCollectManifestEOList.stream()
-                .filter(e -> ObjectUtils.isEmpty(e.getDeadline())).map(ParamsCollectManifestEO::getDeadline).collect(Collectors.toList());
+                .filter(e -> ObjectUtils.isNotEmpty(e.getDeadline())).map(ParamsCollectManifestEO::getDeadline).collect(Collectors.toList());
         Date deadline = null;
         if(ObjectUtils.isNotEmpty(deadlineList)){
             Collections.sort(deadlineList, new Comparator<Date>() {