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 47a7fd0d..e0dcfc46 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
@@ -930,7 +930,6 @@ public class TicketController extends ControllerBase {
     @PostMapping("saveSolutionMeasures")
     @ApiMark(moduleName = "工单管理", apiName = "保存工单解决方案措施")
     public ApiResult<Void> saveSolutionMeasures(@Valid @RequestBody SolutionMeasuresSaveRequest request) {
-
         Ticket ticket = ticketSolutionService.saveSolutionMeasures(request);
         List<SolutionReviewDepartmentVO> audits = ticketSolutionAuditService.getByTicket(request.getTicketId());
         audits.forEach(audit -> {
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 b7a21717..b40ac5c4 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
@@ -198,6 +198,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
                 .set(Ticket::getReason, request.getReason())
                 .set(StrUtil.isNotBlank(request.getQuestion()), Ticket::getQuestion, request.getQuestion())
                 .set(Ticket::getAccidentLevel, request.getAccidentLevel())
+                .set(Ticket::getComponentId, request.getComponentId())
                 .eq(Ticket::getId, request.getTicketId())
                 .update();
         if (CollectionUtil.isNotEmpty(idForReserve)) {
@@ -279,7 +280,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
         }
         ticket1Service.lambdaUpdate()
                 .set(GongfuTicket::getReason, request.getReason())
-                .set(GongfuTicket::getQuestion, request.getQuestion())
+                .set(StrUtil.isNotBlank(request.getQuestion()), GongfuTicket::getQuestion, request.getQuestion())
                 .set(GongfuTicket::getAccidentLevel, request.getAccidentLevel())
                 .set(GongfuTicket::getComponentId, request.getComponentId())
                 .eq(GongfuTicket::getId, request.getTicketId())