From 85fcca335ddf44dc57ab6197fb54c24b8feb3d9d Mon Sep 17 00:00:00 2001
From: username <1532322479@qq.com>
Date: Sat, 14 Jun 2025 11:22:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CtGalleryImagesController.java | 24 ++++++++++++-------
 .../ct/controller/CtTaskBranchController.java | 12 ++++++----
 .../ct/controller/CtTaskInfoController.java   |  8 ++++---
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryImagesController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryImagesController.java
index f541b56..694e03b 100644
--- a/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryImagesController.java
+++ b/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryImagesController.java
@@ -163,13 +163,17 @@ public class CtGalleryImagesController extends BaseController {
                         () -> new HashMap<>()  // 指定 Map 实现类（可选）
                 ));
         List<CtTaskInfo> ctTaskInfos = ctTaskInfoService.list();
-        HashMap<Long, String> infoMap = ctTaskInfos.stream()
-                .collect(Collectors.toMap(
-                        CtTaskInfo::getId,
-                        CtTaskInfo::getTaskTitle,
-                        (existing, replacement) -> existing,
-                        HashMap::new
-                ));
+        HashMap<Long, String> infoMap = new HashMap<>();
+        if (null != ctTaskInfos) {
+            infoMap = ctTaskInfos.stream()
+                    .filter(ctTaskInfo -> ctTaskInfo.getTaskTitle() != null) // 过滤掉taskTitle为空的项
+                    .collect(Collectors.toMap(
+                            CtTaskInfo::getId,
+                            CtTaskInfo::getTaskTitle,
+                            (existing, replacement) -> existing,
+                            HashMap::new
+                    ));
+        }
         for (CtGalleryImages ctGalleryImage : list) {
             Long cataId = ctGalleryImage.getCataId();
             String cataName =  longStringHashMap.get(cataId);
@@ -181,8 +185,10 @@ public class CtGalleryImagesController extends BaseController {
             if (null != feedList && feedList.size() > 0) {
                 for (Long feedId : feedList) {
                     Long taskInfoId = feedbackIdsMap.get(feedId);
-                    String taskTitleName =  infoMap.get(taskInfoId);
-                    taskTitles.add(taskTitleName);
+                    if (null != infoMap && infoMap.size() > 0) {
+                        String taskTitleName =  infoMap.get(taskInfoId);
+                        taskTitles.add(taskTitleName);
+                    }
                 }
                 ctGalleryImage.setTaskTitles(taskTitles);
             }
diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java
index dcf3fa8..c2ce02b 100644
--- a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java
+++ b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java
@@ -314,11 +314,13 @@ public class CtTaskBranchController extends BaseController {
                 Date endDate = sdTaskOther.getEndDate();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
                 // 转换日期为字符串
-                String startDateStr = sdf.format(startDate);
-                String endDateStr = sdf.format(endDate);
-                taskInfo.setStartDate(startDate);
-                taskInfo.setEndDate(endDate);
-                taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+                if (null != startDate && endDate != endDate) {
+                    String startDateStr = sdf.format(startDate);
+                    String endDateStr = sdf.format(endDate);
+                    taskInfo.setStartDate(startDate);
+                    taskInfo.setEndDate(endDate);
+                    taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+                }
                 String deptName = deptMap.get(sdTaskOther.getDeptId());
                 taskInfo.setDeptName(deptName);
                 if ("1".equals(taskInfo.getStatus()) || "0".equals(taskInfo.getStatus())) {
diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java
index bd45da7..5f3d279 100644
--- a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java
+++ b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java
@@ -179,9 +179,11 @@ public class CtTaskInfoController extends BaseController {
             Date endDate = taskInfo.getEndDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
             // 转换日期为字符串
-            String startDateStr = sdf.format(startDate);
-            String endDateStr = sdf.format(endDate);
-            taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+            if (null != startDate && endDate != endDate) {
+                String startDateStr = sdf.format(startDate);
+                String endDateStr = sdf.format(endDate);
+                taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+            }
             String deptName = deptMap.get(taskInfo.getDeptId());
             taskInfo.setDeptName(deptName);
             if ("1".equals(taskInfo.getStatus()) || "0".equals(taskInfo.getStatus())) {