From b07ab7a967fef31a8383d448d666666da7206e5c Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 23 Nov 2024 17:19:05 +0800 Subject: [PATCH] fix --- .../controller/rent/WxAllBillController.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index a94b3c184..3791546a2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -727,12 +727,16 @@ public class WxAllBillController extends BillBaseController { be.setEnergyFeesName(fees.getName()); } } - if (null != shopUserMap) { - WxShopUsers su = shopUserMap.get(be.getShopId()); - if (null != su) { - be.setCusName(su.getName()); - } + + if (StringUtils.isBlank(be.getCusName())) { + if (null != shopUserMap) { + WxShopUsers su = shopUserMap.get(be.getShopId()); + if (null != su) { + be.setCusName(su.getName()); + } + } } + } } return new ResultData(list); @@ -793,11 +797,13 @@ public class WxAllBillController extends BillBaseController { be.setEnergyFeesName(fees.getName()); } } - if (null != shopUserMap) { - WxShopUsers su = shopUserMap.get(be.getShopId()); - if (null != su) { - be.setCusName(su.getName()); - } + if (StringUtils.isBlank(be.getCusName())) { + if (null != shopUserMap) { + WxShopUsers su = shopUserMap.get(be.getShopId()); + if (null != su) { + be.setCusName(su.getName()); + } + } } } }