From 029e97d5f3d6678e9d68861fb27bef0a54d931ee Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 21 Apr 2026 09:40:05 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?= =?UTF-8?q?=20=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5/=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20-=20=E7=BA=BF=E8=B7=AF=E4=B8=BA=E6=B5=B7?= =?UTF-8?q?=E8=BF=90=E7=9A=84=E4=BA=A7=E5=93=81=20=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmisWaybillServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index a4243d722..051da3372 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -6343,7 +6343,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 当前批次所有销售联系人,批量查询分享关系 Set batchSalesmenSet = new LinkedHashSet<>(); for (EmisWaybill waybill : waybillList) { - if (waybill != null && !StringUtils.isEmpty(waybill.getSalesmen())) { + if (waybill != null && !StringUtils.isBlank(waybill.getSalesmen())) { batchSalesmenSet.add(waybill.getSalesmen()); } } @@ -6354,7 +6354,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb .selectValidRelBySalesmenList(new ArrayList<>(batchSalesmenSet)); if (!CollectionUtils.isEmpty(relAllList)) { for (EmisSalesmenRel rel : relAllList) { - if (rel == null || StringUtils.isEmpty(rel.getSalesmen())) { + if (rel == null || StringUtils.isBlank(rel.getSalesmen())) { continue; } salesRelMap.computeIfAbsent(rel.getSalesmen(), k -> new ArrayList<>()).add(rel); @@ -6363,7 +6363,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } for (EmisWaybill waybill : waybillList) { - if (waybill == null || StringUtils.isEmpty(waybill.getBillCode())) { + if (waybill == null || StringUtils.isBlank(waybill.getBillCode())) { continue; } @@ -6372,7 +6372,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb Set notifyEmpNames = new LinkedHashSet<>(); // 销售联系人 - if (!StringUtils.isEmpty(waybill.getSalesmen())) { + if (!StringUtils.isBlank(waybill.getSalesmen())) { String salesmen = waybill.getSalesmen(); notifyEmpNames.add(salesmen); @@ -6380,7 +6380,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb List relList = salesRelMap.get(salesmen); if (!CollectionUtils.isEmpty(relList)) { for (EmisSalesmenRel rel : relList) { - if (rel == null || StringUtils.isEmpty(rel.getSalesAss())) { + if (rel == null || StringUtils.isBlank(rel.getSalesAss())) { continue; } notifyEmpNames.add(rel.getSalesAss()); @@ -6390,10 +6390,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 销售支持 EmisWaybillOther waybillOther = waybill.getWaybillOther(); - if (waybillOther != null && !StringUtils.isEmpty(waybillOther.getSalesSupport())) { + if (waybillOther != null && !StringUtils.isBlank(waybillOther.getSalesSupport())) { String[] supports = waybillOther.getSalesSupport().split("[,,]"); for (String support : supports) { - if (!StringUtils.isEmpty(support)) { + if (!StringUtils.isBlank(support)) { notifyEmpNames.add(support.trim()); } } @@ -6412,7 +6412,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb List users = sysUserMapper.selectUserList(cond); if (!CollectionUtils.isEmpty(users)) { for (SysUser u : users) { - if (u != null && !StringUtils.isEmpty(u.getEmpCode())) { + if (u != null && !StringUtils.isBlank(u.getEmpCode())) { notifyEmpCodes.add(u.getEmpCode()); } }