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;
     }