From f7870182bac674950279269563fc007fd8950e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Thu, 21 Aug 2025 19:52:58 +0800
Subject: [PATCH] =?UTF-8?q?08-21-=E4=BF=AE=E5=A4=8D=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E6=80=A7=E6=89=8B=E7=BB=AD=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusFormalitiesAreConsolidatedServiceImpl.java | 3 ++-
 .../src/main/java/org/dromara/formalities/utils/TreeUtil.java  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
index 0fad7cef..7ee975e2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
@@ -104,7 +104,8 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
         lqw.eq(bo.getPlanTheStartTime() != null, BusFormalitiesAreConsolidated::getPlanTheStartTime, bo.getPlanTheStartTime());
         lqw.eq(StringUtils.isNotBlank(bo.getHead()), BusFormalitiesAreConsolidated::getHead, bo.getHead());
 //        lqw.eq(bo.getActualCompletionTime() != null, BusFormalitiesAreConsolidated::getActualCompletionTime, bo.getActualCompletionTime());
-        lqw.apply(bo.getActualCompletionTime() != null,"DATE_FORMAT(actual_completion_time,'%Y-%m-%d')");
+//        lqw.apply(bo.getActualCompletionTime() != null,"DATE_FORMAT(actual_completion_time,'%Y-%m-%d')");
+        lqw.apply(bo.getActualCompletionTime() != null, "DATE_FORMAT(actual_completion_time,'%Y-%m-%d') = '" + bo.getActualCompletionTime() + "'");
         lqw.eq(StringUtils.isNotBlank(bo.getProcessingStatus()), BusFormalitiesAreConsolidated::getProcessingStatus, bo.getProcessingStatus());
         return lqw;
     }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java
index 41683236..ac10ac9d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java
@@ -61,6 +61,9 @@ public class TreeUtil {
                 setChildren1(node, list);
             }
         }
+        if (result.isEmpty()){
+            return list;
+        }
         return result;
     }