From 89919412a7d94f87aea159b39d823e5d6014a20e Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 21 十月 2024 10:52:21 +0800 Subject: [PATCH] zjh20241021 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 4 +++- 1 files changed, 3 insertions(+), 1 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 82967ba..0665064 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 @@ -231,7 +231,7 @@ ArrayList<TjCustomer> tjCustomers = new ArrayList<>(); for (TjSampling tjSampling : list) { TjCustomer customer = customerService.getById(tjSampling.getCusId()); - customer.setCusName(MatchUtils.hideCusName(customer.getCusName())); + customer.setCusName(customer.getCusName()); customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone())); customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard())); customer.setTjNumber(tjSampling.getTjNum()); @@ -268,6 +268,8 @@ } for (TjSampling sampling : list) { TjCustomer customer = customerService.getById(sampling.getCusId()); + TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum()); + if(null !=order)sampling.setCardId(order.getCardId()); sampling.setCustomer(customer); } return AjaxResult.success(list); -- Gitblit v1.8.0