bs-admin/src/main/java/com/bs/ct/controller/CtGalleryImagesController.java

@@ -163,17 +163,13 @@ public class CtGalleryImagesController extends BaseController {
                         () -> new HashMap<>()  // 指定 Map 实现类（可选）
                 ));
         List<CtTaskInfo> ctTaskInfos = ctTaskInfoService.list();
-        HashMap<Long, String> infoMap = new HashMap<>();
+        HashMap<Long, String> infoMap = ctTaskInfos.stream()
-        if (null != ctTaskInfos) {
+                .collect(Collectors.toMap(
-            infoMap = ctTaskInfos.stream()
+                        CtTaskInfo::getId,
-                    .filter(ctTaskInfo -> ctTaskInfo.getTaskTitle() != null) // 过滤掉taskTitle为空的项
+                        CtTaskInfo::getTaskTitle,
-                    .collect(Collectors.toMap(
+                        (existing, replacement) -> existing,
-                            CtTaskInfo::getId,
+                        HashMap::new
-                            CtTaskInfo::getTaskTitle,
+                ));
-                            (existing, replacement) -> existing,
-                            HashMap::new
-                    ));
-        }
         for (CtGalleryImages ctGalleryImage : list) {
             Long cataId = ctGalleryImage.getCataId();
             String cataName =  longStringHashMap.get(cataId);
@@ -185,10 +181,8 @@ public class CtGalleryImagesController extends BaseController {
             if (null != feedList && feedList.size() > 0) {
                 for (Long feedId : feedList) {
                     Long taskInfoId = feedbackIdsMap.get(feedId);
-                    if (null != infoMap && infoMap.size() > 0) {
+                    String taskTitleName =  infoMap.get(taskInfoId);
-                        String taskTitleName =  infoMap.get(taskInfoId);
+                    taskTitles.add(taskTitleName);
-                        taskTitles.add(taskTitleName);
-                    }
                 }
                 ctGalleryImage.setTaskTitles(taskTitles);
             }

bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java

@@ -314,13 +314,11 @@ public class CtTaskBranchController extends BaseController {
                 Date endDate = sdTaskOther.getEndDate();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
                 // 转换日期为字符串
-                if (null != startDate && endDate != endDate) {
+                String startDateStr = sdf.format(startDate);
-                    String startDateStr = sdf.format(startDate);
+                String endDateStr = sdf.format(endDate);
-                    String endDateStr = sdf.format(endDate);
+                taskInfo.setStartDate(startDate);
-                    taskInfo.setStartDate(startDate);
+                taskInfo.setEndDate(endDate);
-                    taskInfo.setEndDate(endDate);
+                taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
-                    taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
-                }
                 String deptName = deptMap.get(sdTaskOther.getDeptId());
                 taskInfo.setDeptName(deptName);
                 if ("1".equals(taskInfo.getStatus()) || "0".equals(taskInfo.getStatus())) {

bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java

@@ -179,11 +179,9 @@ public class CtTaskInfoController extends BaseController {
             Date endDate = taskInfo.getEndDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
             // 转换日期为字符串
-            if (null != startDate && endDate != endDate) {
+            String startDateStr = sdf.format(startDate);
-                String startDateStr = sdf.format(startDate);
+            String endDateStr = sdf.format(endDate);
-                String endDateStr = sdf.format(endDate);
+            taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
-                taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
-            }
             String deptName = deptMap.get(taskInfo.getDeptId());
             taskInfo.setDeptName(deptName);
             if ("1".equals(taskInfo.getStatus()) || "0".equals(taskInfo.getStatus())) {