From bb70fcb97fb7e4601420aee2b72fca345d64fb11 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 13 Nov 2024 09:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=BE=E9=97=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=81=9A=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=96=E4=BB=AC=E4=B9=8B=E9=97=B4=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=83=BD=E5=A4=9F=E4=BA=92=E7=9B=B8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=B9=B6=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java  | 4 ++--
 .../tickets/service/impl/DlTicketWaresServiceImpl.java    | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 1a4c1845..83451994 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -856,8 +856,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
                 repairTicketsReqVO.setUserIds(Collections.singletonList(SecurityFrameworkUtils.getLoginUserId()));
             }
         } else if (userRoleCode.equals(RepairRoleEnum.ADVISOR.getCode())) {
-            //服务顾问
-            repairTicketsReqVO.setAdviserId(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+            //服务顾问，暂时看所有的工单
+//            repairTicketsReqVO.setAdviserId(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
         } else if (userRoleCode.equals(RepairRoleEnum.REPAIR_STAFF.getCode())) {
             //维修工，进一步判断是否是班组长
             boolean ifLeader = repairWorkerService.getIfLeader();
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
index 9cd3c50e..b9e3ea7e 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
@@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.tickets.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.common.RecordTypeEnum;
 import cn.iocoder.yudao.common.RepairRoleEnum;
 import cn.iocoder.yudao.common.SoStatusEnum;
-import cn.iocoder.yudao.common.TicketsItemStatusEnum;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import cn.iocoder.yudao.module.base.service.RepairRecordsService;
 import cn.iocoder.yudao.module.base.service.RepairWorkerService;
@@ -47,7 +44,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
@@ -120,8 +116,8 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
         if (userRoleCode.equals(RepairRoleEnum.ADMIN.getCode()) || userRoleCode.equals(RepairRoleEnum.INSPECTION.getCode())) {
             //维修管理员和总检，看所有数据
         } else if (userRoleCode.equals(RepairRoleEnum.ADVISOR.getCode())) {
-            //服务顾问
-            reqVO.setAdviserId(SecurityFrameworkUtils.getLoginUserId());
+            //服务顾问--暂时看所有的配件申请单
+//            reqVO.setAdviserId(SecurityFrameworkUtils.getLoginUserId());
         } else if (userRoleCode.equals(RepairRoleEnum.REPAIR_STAFF.getCode())) {
             //维修工，进一步判断是否是班组长
             boolean ifLeader = repairWorkerService.getIfLeader();