From 653d67ef574c8ef1a64605f517f329eb6e6aec12 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 17:00:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 133dc4c..7fef050 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -462,7 +462,10 @@
dateTimeFormatter),LocalTime.of(23, 59, 59)
).toString();
// 鑾峰彇鏁版嵁
- String company = data.get("company").toString();
+ String company = "";
+ if(data.containsKey("company")) {
+ company = data.get("company").toString();
+ }
List<CommissionFeesDto> list = insOrderMapper.selectCommissionFees(laboratory,company, start, end);
list = list.stream().map(dto -> {
Set<String> uniqueTags = new HashSet<>();
--
Gitblit v1.9.3