459242451@qq.com 3 anos atrás
pai
commit
b815f6ca96

+ 3 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -134,7 +134,7 @@ public class IncidentController extends BaseController {
     public AjaxResult<Map<String, Object>> getInfo(@NotNull(message = "主键不能为空")
                                                    @PathVariable("id") String id) {
         Map<String, Object> map = new HashMap<>();
-        String fileUrl = "";
+        List<PlanFileVo> planFileVos = new ArrayList<>();
         IncidentVo incidentVo = iIncidentService.queryById(id);
         map.put("baseInfo", incidentVo);
         // 查询所属预案
@@ -142,14 +142,11 @@ public class IncidentController extends BaseController {
         if (voOne != null && voOne.size() > 0) {
             map.put("baseTask", planTaskService.queryPlanTaskByPlanId(voOne.get(0).getId()));
             // 查询预案附件
-            List<PlanFileVo> planFileVos = planFileService.listVo(Wrappers.<PlanFile>lambdaQuery().eq(PlanFile::getPlanId, voOne.get(0).getId()));
-            if (planFileVos != null && planFileVos.size() > 0) {
-                fileUrl = planFileVos.get(0).getFileUrl();
-            }
+            planFileVos = planFileService.listVo(Wrappers.<PlanFile>lambdaQuery().eq(PlanFile::getPlanId, voOne.get(0).getId()));
         } else {
             map.put("baseTask", null);
         }
-        map.put("planFile", fileUrl);
+        map.put("planFile", planFileVos);
         // 查询处置方案
         map.put("task", incidentTaskService.listTaskInfo(id));
         List<IncidentProcess> list = iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()