From 775691fe9ea1eb34047dbaa5ecd852ab694d87ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 4 Feb 2026 09:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=A0=B4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=83=A8=E4=BD=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/admin/controller/TicketController.java   | 1 -
 .../service/impl/TicketSolutionServiceImpl.java           | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
index e0dcfc46..cc85ad3a 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
@@ -918,7 +918,6 @@ public class TicketController extends ControllerBase {
     @GetMapping("getSolutionMeasures")
     @ApiMark(moduleName = "工单管理", apiName = "获取工单解决方案措施")
     public ApiResult<SolutionMeasuresVO> getSolutionMeasures(@Valid @RequestParam @NotNull Long ticketId) {
-
         return ApiResult.success(ticketSolutionService.getSolutionMeasures(ticketId));
     }
 
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
index 5c1ab2cc..37f6ceaf 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
@@ -133,11 +133,9 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
             }
         }
         vo.setMeasures(items);
-        if (Objects.equals(ticket.getType(), 1)) {
-            DeviceInfoVO deviceInfoVO = deviceService.getByDeviceNo(ticket.getDeviceNo());
-            if (Objects.nonNull(deviceInfoVO)) {
-                vo.setComponents(deviceInfoVO.getComponents());
-            }
+        DeviceInfoVO deviceInfoVO = deviceService.getByDeviceNo(ticket.getDeviceNo());
+        if (Objects.nonNull(deviceInfoVO)) {
+            vo.setComponents(deviceInfoVO.getComponents());
         }
         return vo;
     }