From f3c29f0c5d6508745c1076f37cc86113cae041dd Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 6 May 2025 13:05:45 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=9B=9E=E6=AC=BE/=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E6=A0=A1=E9=AA=8Cbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/EmisBaseService.java     | 18 ++++++++++---
 .../service/impl/EmisWaybillServiceImpl.java  | 25 +++++++++++++------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 621e86440..140e2eb50 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -3129,13 +3129,23 @@ public class EmisBaseService {
      }
 
      /**
-      * 获取用户列表
+      * 获取回款联系人列表
       *
       * @param sysUser
-      * @return 用户列表
+      * @return 回款联系人列表
       */
-     public List<SysUser> getEmisStaffListByEmpName(SysUser sysUser) {
-         return sysUserMapper.selectUserList(sysUser);
+     public List<SysUser> getPayeeListByEmpName(SysUser sysUser) {
+         return sysUserMapper.selectPayeeList(sysUser);
+     }
+
+     /**
+      * 获取销售联系人列表
+      *
+      * @param sysUser
+      * @return 销售联系人列表
+      */
+     public List<SysUser> getSalesmenListByEmpName(SysUser sysUser) {
+         return sysUserMapper.selectSalesmenList(sysUser);
      }
 
      public SysUser getEmisStaffBySiteCodeAndEmpName(String ownerSiteCode,String empName){
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 623b9b885..fac8b5f06 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
@@ -930,12 +930,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setTakePieceEmployeeCode(empUser.getEmpCode());
         }
 
-        // 收款人备注
-        List<SysUser> payeeUsers = getSysUsers(emisWaybillSave.getPayee());
+        // 回款联系人校验
+        List<SysUser> payeeUsers = getPayeeList(emisWaybillSave.getPayee());
         if (CollectionUtil.isEmpty(payeeUsers)) {
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人不支持回款");
         }
-        List<SysUser> salesmenUsers = getSysUsers(emisWaybillSave.getSalesmen());
+        // 销售联系人校验
+        List<SysUser> salesmenUsers = getSalesmenList(emisWaybillSave.getSalesmen());
         if (CollectionUtil.isEmpty(salesmenUsers)) {
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款");
         }
@@ -1088,14 +1089,24 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
     }
 
-    private List<SysUser> getSysUsers(String userName) {
+    private List<SysUser> getPayeeList(String userName) {
         SysUser sysUser = new SysUser();
         sysUser.setEmpName(userName);
-        List<SysUser> userList = getEmisStaffListByEmpName(sysUser);
+        List<SysUser> userList = getPayeeListByEmpName(sysUser);
         List<SysUser> users = userList.stream()
                 .filter(i -> i.getEmpName() != null &&
-                        i.getEmpName().equals(userName) &&
-                        "1".equals(i.getBlPayeeRemark()))
+                        i.getEmpName().equals(userName))
+                .collect(Collectors.toList());
+        return users;
+    }
+
+    private List<SysUser> getSalesmenList(String userName) {
+        SysUser sysUser = new SysUser();
+        sysUser.setEmpName(userName);
+        List<SysUser> userList = getSalesmenListByEmpName(sysUser);
+        List<SysUser> users = userList.stream()
+                .filter(i -> i.getEmpName() != null &&
+                        i.getEmpName().equals(userName))
                 .collect(Collectors.toList());
         return users;
     }