From 2ebfd8eab902d5f1d971921a37da844ab0553367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 25 Mar 2026 16:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8D=95=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9;=E8=8F=9C=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ScheduledTaskServiceImpl.java          |  5 +++++
 .../service/menu/MenuApplicationService.java           | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java
index 08b0e2fe3..53fd369ed 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java
@@ -110,6 +110,9 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
             businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
             businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
             businessDataPushDTO.setDataSources(1);
+
+            businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
+            businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
             bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
         }
         log.info("定时任务整租推送到bms触发--结束");
@@ -156,6 +159,8 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
             businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
             businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
             businessDataPushDTO.setDataSources(1);
+            businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
+            businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
             bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
         }
     }
diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java
index 47bc54348..82795f97e 100644
--- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java
+++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java
@@ -575,21 +575,23 @@ public class MenuApplicationService {
             navigationProduct = sysProductDomainService.getNavigationProduct(navigationMenu, longs, tenantsId);
         }
         //获取菜单类型
+        List<Menu> menus = menuMapper.selectList(null);
         for (NavigationVo navigationVo : navigationProduct) {
-            getMenuType(navigationVo);
+            getMenuType(navigationVo, menus);
         }
         return navigationProduct;
     }
-    private NavigationVo getMenuType(NavigationVo navigationVo) {
+    private NavigationVo getMenuType(NavigationVo navigationVo,List<Menu> menus) {
         Long id = navigationVo.getId();
-        Menu menu = menuMapper.selectById(id);
+        Menu menu = menus.stream().filter(m -> m.getMenuId().equals(id)).findFirst().orElse(null);
+        //Menu menu = menuMapper.selectById(id);
         if (menu != null) {
             navigationVo.setMenuType(menu.getMenuType());
         }
         List<NavigationVo> children = navigationVo.getChildren();
         if (children != null && children.size() > 0) {
             for (NavigationVo child : children) {
-                getMenuType(child);
+                getMenuType(child,menus);
             }
         }
         return navigationVo;