Merge remote-tracking branch 'origin/develop' into develop

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/WorkOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.tuoheng.admin.mapper.WorkOrderMapper;
 import com.tuoheng.admin.mapper.WorkOrderQuestionMapper;
 import com.tuoheng.admin.service.IWorkOrderService;
 import com.tuoheng.common.common.BaseServiceImpl;
+import com.tuoheng.common.config.CommonConfig;
 import com.tuoheng.common.exception.ServiceException;
 import com.tuoheng.common.utils.DateUtils;
 import com.tuoheng.common.utils.JsonResult;
@@ -186,6 +187,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         IPage<WorkOrderQuestionVO> page = new Page<>(request.getPage(), request.getLimit());
         // 查询结果
         IPage<WorkOrderQuestionVO> pageInfo = workOrderMapper.questionPage(page, request);
+        for (WorkOrderQuestionVO record : pageInfo.getRecords()) {
+            if(StringUtils.isNotEmpty(record.getHandlerImage())){
+                String[] imgHanders = record.getHandlerImage().split(",");
+                for (int i = 0; i < imgHanders.length; i++) {
+                    imgHanders[i] = CommonConfig.imageURL + imgHanders[i];
+                }
+                String handerImg = StringUtils.join(imgHanders, ",");
+                record.setHandlerImage(handerImg);
+            }
+        }
         return JsonResult.success(pageInfo);
     }
 
@@ -200,6 +211,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         QuestionHandle questionHandle = questionHandleMapper.selectOne(new LambdaQueryWrapper<QuestionHandle>()
                 .eq(QuestionHandle::getQuestionId, questionId)
                 .eq(QuestionHandle::getMark, MarkTypeEnum.VALID.getCode()));
+        //拼接图片域名
+        if(null != questionHandle && StringUtils.isNotEmpty(questionHandle.getHandlerImage())){
+            String[] imgHanders = questionHandle.getHandlerImage().split(",");
+            for (int i = 0; i < imgHanders.length; i++) {
+                imgHanders[i] = CommonConfig.imageURL + imgHanders[i];
+            }
+            String handerImg = StringUtils.join(imgHanders, ",");
+            questionHandle.setHandlerImage(handerImg);
+        }
 
         //查询问题处理状态
         WorkOrderQuestion workOrderQuestion = workOrderQuestionMapper.selectOne(new LambdaQueryWrapper<WorkOrderQuestion>()