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 b40ac5c4..91756896 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;
     }