From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleSyncServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleSyncServiceImpl.java
index dba60e7..b9f4b69 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleSyncServiceImpl.java
@@ -231,12 +231,12 @@
}
/**
- * 浠嶤arOrdClass瑙ｆ瀽閮ㄩ棬ID
+ * 浠� CarOrdClass 瑙ｆ瀽閮ㄩ棬ID锛屽苟杞崲涓哄垎鍏徃ID
* CarOrdClass鏍煎紡鍙兘鏄細ZB銆丠B.TI绛�
* 闇�瑕佹媶鍒嗗苟鍦╯ys_dept涓尮閰峝ispatch_order_class瀛楁
*
* @param carOrdClass 杞﹁締鍗曟嵁绫诲瀷缂栫爜
- * @return 閮ㄩ棬ID锛屽鏋滄湭鎵惧埌杩斿洖null
+ * @return 鍒嗗叕鍙窱D锛屽鏋滄湭鎵惧埌杩斿洖null
*/
private Long parseDeptIdFromCarOrdClass(String carOrdClass)
{
@@ -264,7 +264,19 @@
{
log.debug("閫氳繃dispatch_order_class='{}' 鎵惧埌閮ㄩ棬: {} (ID={})",
code, dept.getDeptName(), dept.getDeptId());
- return dept.getDeptId();
+
+ // 灏嗛儴闂↖D杞崲涓哄垎鍏徃ID
+ Long branchCompanyId = sysDeptMapper.selectBranchCompanyIdByDeptId(dept.getDeptId());
+ if (branchCompanyId != null)
+ {
+ log.debug("灏嗛儴闂↖D {} 杞崲涓哄垎鍏徃ID: {}", dept.getDeptId(), branchCompanyId);
+ return branchCompanyId;
+ }
+ else
+ {
+ log.warn("閮ㄩ棬ID {} 鏃犳硶杞崲涓哄垎鍏徃ID锛屽彲鑳芥槸鎬诲叕鍙告垨鏁版嵁寮傚父", dept.getDeptId());
+ return null;
+ }
}
}
--
Gitblit v1.9.1