From 8568fb4237a295b321517ddcdecac0d6503de5de Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 17 Jul 2023 11:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDiscountpackageHandoverService.java    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
index 1c8650a2d1..2e34dba244 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
@@ -243,6 +243,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         IPage<BusDiscountpackageHandoverVo> pagging = baseMapper.selectPageVo(page, qw);
         List<BusDiscountpackageHandoverVo> records = pagging.getRecords();
         if (null != records) {
+            //根据当前用户sid查询用户角色
+            List<SysRoleVo> roleVoList = sysRoleFeign.fetchByUserSid(query.getUserSid()).getData();
+            roleVoList.removeAll(Collections.singleton(null));
             for (BusDiscountpackageHandoverVo record : records) {
                 if (null != record) {
 //                    待准备 服务站人员 ture 销售专员 false
@@ -251,9 +254,21 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                             record.setShowToDoHandover(false);
                             record.setShowHandover(true);
                         }
-                        if ("003".equals(record.getTransferStateKey())) {
-                            record.setShowToDoHandover(true);
-                            record.setShowHandover(false);
+                        //判断当前登录用户角色是否为销售专员
+                        if (!roleVoList.isEmpty()) {
+                            for (SysRoleVo sysRoleVo : roleVoList) {
+                                if ((sysRoleVo.getName()).contains("优惠包管理员")) {
+                                    if ("003".equals(record.getTransferStateKey())) {
+                                        record.setShowToDoHandover(false);
+                                        record.setShowHandover(false);
+                                    }
+                                } else {
+                                    if ("003".equals(record.getTransferStateKey())) {
+                                        record.setShowToDoHandover(true);
+                                        record.setShowHandover(false);
+                                    }
+                                }
+                            }
                         }
                     }
                     if (StringUtils.isNotBlank(record.getContractNo())) {
@@ -398,7 +413,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                     if (null != busFiles && i > 0) {
                         this.uploadPicture(dto);
                     }
-                } else if ((sysRoleVo.getName()).contains("服务站长")) {
+                } else if ((sysRoleVo.getName()).contains("优惠包管理员")) {
                     dto.setTransferStateKey("003");
                     dto.setTransferStateValue("移交中");
                     dto.setTransferUserSid(userSid);