From 53bdbbe24be152c7696ed5e1041d25276b79ff16 Mon Sep 17 00:00:00 2001
From: xuyuncong <3422692813@qq.com>
Date: Tue, 11 Nov 2025 19:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java  | 8 ++++----
 .../tickets/service/impl/DlTicketWaresServiceImpl.java    | 2 +-
 2 files changed, 5 insertions(+), 5 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 b3a30470..d7c58371 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
@@ -1823,10 +1823,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         if (codes.contains(RepairRoleEnum.ADVISOR.getCode())) {
             return RepairRoleEnum.ADVISOR.getCode();
         }
-        // 维修工（或班组长）
-        if (codes.contains(RepairRoleEnum.REPAIR_STAFF.getCode())) {
-            return RepairRoleEnum.REPAIR_STAFF.getCode();
-        }
         // 维修仓库管理员
         if (codes.contains(RepairRoleEnum.WAREHOUSE.getCode())) {
             return RepairRoleEnum.WAREHOUSE.getCode();
@@ -1835,6 +1831,10 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         if (codes.contains(RepairRoleEnum.WXCW.getCode())) {
             return RepairRoleEnum.WXCW.getCode();
         }
+        // 维修工（或班组长）
+        if (codes.contains(RepairRoleEnum.REPAIR_STAFF.getCode())) {
+            return RepairRoleEnum.REPAIR_STAFF.getCode();
+        }
         // 啥也不是
         return null;
     }
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 501a3e02..88f4a2c9 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
@@ -126,7 +126,7 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
             //维修管理员和总检，看所有数据
         } 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();