From 47aed74050e956919f2eee588fbab15607cf4029 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十月 2023 17:20:31 +0800
Subject: [PATCH] zjh 2023/10/31--1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index bd6ff4f..e769abc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -498,8 +498,12 @@
                             tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                             tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
                             tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-                            if (null != order.getDictCompName())
-                                tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
+                            if (null != order.getFirmId()){
+                                DictComp byId = compService.getById(order.getFirmId());
+                                if(null != byId){
+                                    tjRefundVo.setTjComp(byId.getCnName());
+                                }
+                            }
                             if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
                             TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
                                     .eq(TjFlowingWater::getOrderId, order.getOrderId())

--
Gitblit v1.8.0