From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index d50faef..31ff890 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -557,13 +557,9 @@
                     order.setIdType(tjCustomer.getIdType());
                     order.setAgeUnit(tjCustomer.getAgeUnit());
                     order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
-                    if (null != tjCustomer.getCompName()) {
-                        order.setDictCompName(tjCustomer.getCompName());
-                    } else {
-                        String firmId = order.getFirmId();
-                        if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
-                            order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
-                        }
+                    String firmName = order.getFirmName();
+                    if (StringUtil.isNotBlank(firmName)) {
+                        order.setDictCompName(firmName);
                     }
                     if (null != order.getPacId()) {
                         if (null != tjPackageService.getById(order.getPacId())) {

--
Gitblit v1.8.0