diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java
index 61339711..f5803f59 100644
--- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java
+++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java
@@ -929,7 +929,7 @@ 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, Constant.DEFAULT_LANGUAGE_CODE));
+        return ApiResult.success(ticketSolutionService.getSolutionMeasures(ticketId, MultilingualUtil.getLanguage()));
     }
 
     /**
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionAuditMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionAuditMapper.java
index 68ca894e..4b1e811d 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionAuditMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionAuditMapper.java
@@ -16,5 +16,5 @@ import java.util.List;
  */
 public interface TicketSolutionAuditMapper extends BaseMapper<TicketSolutionAudit> {
 
-    List<SolutionReviewDepartmentVO> getByTicket(Long ticketId);
+    List<SolutionReviewDepartmentVO> getByTicket(Long ticketId,String languageCode);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionMapper.java
index 7f799f01..864c0d1e 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketSolutionMapper.java
@@ -3,6 +3,8 @@ package com.nflg.mobilebroken.repository.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nflg.mobilebroken.repository.entity.TicketSolution;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,5 @@ import com.nflg.mobilebroken.repository.entity.TicketSolution;
  */
 public interface TicketSolutionMapper extends BaseMapper<TicketSolution> {
 
+    List<TicketSolution> getList(Long ticketId, String language);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
index 3d0278af..523d2b11 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
@@ -53,7 +53,7 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
     @Override
     public List<SolutionReviewDepartmentVO> getByTicket(Long ticketId,String languageCode) {
         List<DictionaryItem> items = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_REVIEW_DEPARTMENT, languageCode);
-        List<SolutionReviewDepartmentVO> vos = baseMapper.getByTicket(ticketId);
+        List<SolutionReviewDepartmentVO> vos = baseMapper.getByTicket(ticketId,languageCode);
         items.forEach(item -> {
             if (vos.stream().noneMatch(vo -> vo.getDeptName().equals(item.getName()))) {
                 SolutionReviewDepartmentVO vo = new SolutionReviewDepartmentVO();
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 dc4d6aac..6239d670 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
@@ -61,14 +61,15 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
     private IDeviceService deviceService;
 
     @Override
-    public SolutionMeasuresVO getSolutionMeasures(Long ticketId,String language) {
+    public SolutionMeasuresVO getSolutionMeasures(Long ticketId, String language) {
         TicketDTO ticket = ticketService.getDto(ticketId);
         VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
         List<DictionaryItem> initial = new ArrayList<>();
         if (Objects.equals(ticket.getState(), TicketState.Processing.getState()) || Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState())) {
             initial = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_MEASURES, language);
         }
-        List<TicketSolution> solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list();
+//        List<TicketSolution> solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list();
+        List<TicketSolution> solutions = baseMapper.getList(ticketId, language);
         Map<Integer, List<TicketSolution>> groupedSolutions = solutions.stream().collect(Collectors.groupingBy(TicketSolution::getDictionaryItemId, LinkedHashMap::new, Collectors.toList()));
         SolutionMeasuresVO vo = new SolutionMeasuresVO();
         if (SaTokenAdminUtil.isLogin()) {
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionAuditMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionAuditMapper.xml
index 57eb17e2..6d8cb711 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionAuditMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionAuditMapper.xml
@@ -2,20 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.TicketSolutionAuditMapper">
     <select id="getByTicket" resultType="com.nflg.mobilebroken.common.pojo.vo.SolutionReviewDepartmentVO">
-        SELECT tsa.id,
-               tsa.dept_name,
-               tsa.user_id,
-               au.user_name,
-               tsa.state,
-               d.dept_name     AS user_dept_name,
-               p.position_name AS user_title,
-               au.user_code,
-               tsa.reason,
-               tsa.create_time
+        SELECT tsa.id,dit.value as dept_name,tsa.user_id,au.user_name,tsa.state,d.dept_name AS user_dept_name
+                ,p.position_name AS user_title,au.user_code,tsa.reason,tsa.create_time
         FROM ticket_solution_audit tsa
-                 LEFT JOIN admin_user au ON tsa.user_id = au.id
-                 LEFT JOIN t_base_department d ON d.id = au.department_id
-                 LEFT JOIN t_base_position p ON p.id = au.title_id
+        LEFT JOIN admin_user au ON tsa.user_id = au.id
+        LEFT JOIN t_base_department d ON d.id = au.department_id
+        LEFT JOIN t_base_position p ON p.id = au.title_id
+        left join dictionary_item_translate dit on tsa.dept_id=dit.dictionary_item_id and dit.language_code=#{languageCode}
         WHERE tsa.ticket_id = #{ticketId}
     </select>
 </mapper>
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionMapper.xml
index d0d3f4d3..8e09a406 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketSolutionMapper.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.TicketSolutionMapper">
 
+    <select id="getList" resultType="com.nflg.mobilebroken.repository.entity.TicketSolution">
+        select dit.value as dictionary_item_name,ts.*
+        from ticket_solution ts
+        left join dictionary_item di on ts.dictionary_item_id=di.id
+        left join dictionary_item_translate dit on di.id=dit.dictionary_item_id and dit.language_code=#{language}
+        where ts.ticket_id=#{ticketId}
+    </select>
 </mapper>