From 3620453ef3ebf3ba1542c180d942443a4a934d67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 六月 2025 18:05:04 +0800
Subject: [PATCH] zjh20250625
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 51d0401..727eaf4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -245,13 +245,16 @@
TjCustomer customer = customerService.getById(tjSampling.getCusId());
if(null !=customer){
TjOrder order = orderService.getOrderByTjNum(tjSampling.getTjNum());
- customer.setCompName(order.getFirmName());
- customer.setCusName(customer.getCusName());
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjSampling.getTjNum());
- customer.setApplicationTime(tjSampling.getApplicationTime());
- tjCustomers.add(customer);
+ if(null !=order){
+ customer.setCompName(order.getFirmName());
+ customer.setCusName(customer.getCusName());
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjSampling.getTjNum());
+ customer.setApplicationTime(tjSampling.getApplicationTime());
+ tjCustomers.add(customer);
+ }
+
}
}
HashMap<String, Object> hashMap = new HashMap<>();
--
Gitblit v1.8.0