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 1dc55e448..fcfbe1664 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
@@ -1269,55 +1269,41 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         String payee = wb.getPayee();
         if (StringUtils.isNotBlank(payee)) {
             String payeeName = payee.trim();
-            SysUser payeeUser = getEmisStaffByEmpName(payeeName);
-            if (payeeUser == null) {
-                throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人" + payeeName + "不存在");
-            }
-            if (!"1".equals(payeeUser.getBlPayeeRemark())) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "无回款权限");
-            }
-            if (!"1".equals(payeeUser.getBlOpen())) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "未启用");
+            SysUser payeeCond = new SysUser();
+            payeeCond.setEmpName(payeeName);
+            payeeCond.setBlPayeeRemark("1");
+            payeeCond.setBlOpen("1");
+            List<SysUser> payeeUsers = sysUserMapper.selectUserList(payeeCond);
+            if (CollectionUtil.isEmpty(payeeUsers)) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "当前回款联系人" + payeeName + "已失效，请更换客户对应的回款联系人");
             }
         }
         String salesmen = wb.getSalesmen();
         if (StringUtils.isNotBlank(salesmen)) {
             String salesmenName = salesmen.trim();
-            SysUser salesUser = getEmisStaffByEmpName(salesmenName);
-            if (salesUser == null) {
-                throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人" + salesmenName + "不存在");
-            }
-            if (!"1".equals(salesUser.getBlPayeeRemark())) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "无回款权限");
-            }
-            if (!"1".equals(salesUser.getBlOpen())) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "未启用");
+            SysUser salesCond = new SysUser();
+            salesCond.setEmpName(salesmenName);
+            salesCond.setBlPayeeRemark("1");
+            salesCond.setBlOpen("1");
+            List<SysUser> salesUsers = sysUserMapper.selectUserList(salesCond);
+            if (CollectionUtil.isEmpty(salesUsers)) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售联系人" + salesmenName + "已失效，请更换客户对应的销售联系人");
             }
         }
-        String salesSupportRaw = null;
-        if (wb.getWaybillOther() != null) {
-            salesSupportRaw = wb.getWaybillOther().getSalesSupport();
+        if(wb.getWaybillOther()==null){
+            return;
         }
-        if (StringUtils.isBlank(salesSupportRaw)) {
-            salesSupportRaw = wb.getSalesSupport();
-        }
-        String salesSupportToCheck = StringUtils.trimToEmpty(salesSupportRaw);
-        if (StringUtils.isNotBlank(salesSupportToCheck)) {
-            String[] supports = salesSupportToCheck.split("[,，]");
-            for (String support : supports) {
-                if (StringUtils.isBlank(support)) {
-                    continue;
-                }
-                String supportName = support.trim();
-                SysUser supportUser = getEmisStaffByEmpName(supportName);
-                if (supportUser == null) {
-                    throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售支持" + supportName + "不存在");
-                }
-                if (!"1".equals(supportUser.getBlOpen())) {
-                    throw new EmisBizError(EmisBizErrorType.FAIL, "销售支持" + supportName + "未启用");
-                }
+        String support = wb.getWaybillOther().getSalesSupport().trim();
+        if (StringUtils.isNotBlank(support)) {
+            SysUser supportCond = new SysUser();
+            supportCond.setEmpName(support);
+            supportCond.setBlOpen("1");
+            List<SysUser> supportUsers = sysUserMapper.selectUserList(supportCond);
+            if (CollectionUtil.isEmpty(supportUsers)) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售支持" + support + "已失效，请更换客户对应的销售支持");
             }
         }
+
     }