fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/NoticeInfoListiner.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
@@ -214,9 +215,18 @@ public class NoticeInfoListiner {
      */
     private String getDetail(IncidentVo incidentVo) {
         // 翻译事件类型、事件等级、事件来源、上报人员、上报单位
-        String type = dictDataService.selectDictLabel("zhdd_incident_type", Convert.toStr(incidentVo.getType()));
-        String level = dictDataService.selectDictLabel("zhdd_incident_level", Convert.toStr(incidentVo.getLevel()));
-        String source = dictDataService.selectDictLabel("zhdd_incident_source", incidentVo.getSource());
+        String type = "";
+        String level = "";
+        String source = "";
+        if (ObjectUtil.isNotEmpty(incidentVo.getType())) {
+            type = dictDataService.selectDictLabel("zhdd_incident_type", Convert.toStr(incidentVo.getType()));
+        }
+        if (ObjectUtil.isNotEmpty(incidentVo.getLevel())) {
+            level = dictDataService.selectDictLabel("zhdd_incident_level", Convert.toStr(incidentVo.getLevel()));
+        }
+        if (StrUtil.isNotBlank(incidentVo.getSource())) {
+            source = dictDataService.selectDictLabel("zhdd_incident_source", incidentVo.getSource());
+        }
         incidentVo.setTypeText(type);
         incidentVo.setLevelText(level);
         incidentVo.setSource(source);

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

@@ -190,7 +190,6 @@ public class IncidentController extends BaseController {
         }
         incidentVo.setAssistDeptList(assistList);
 
-        map.put("baseInfo", incidentVo);
         // 查询所属预案
         List<PlanVo> voOne = planService.listVo(Wrappers.<Plan>lambdaQuery().eq(Plan::getType, incidentVo.getType()).eq(Plan::getCreateDept, incidentVo.getPlanDept()));
         if (voOne != null && voOne.size() > 0) {
@@ -207,8 +206,18 @@ public class IncidentController extends BaseController {
             .eq(IncidentProcess::getIncidentId, id)
 //            .in(IncidentProcess::getIncidentStatus, 3, 4, 5)
             .orderByAsc(IncidentProcess::getCreateTime));
+        String distributeTime = "";
+        String dealTime = "";
         if (!"dev".equals(env)) {
             for (IncidentProcess incidentProcess : list) {
+                // 处理首次派发和首页处理的时间
+                if (StrUtil.isBlank(distributeTime) && incidentProcess.getIncidentStatus() == 2 && StrUtil.contains(incidentProcess.getDes(), "事件派发")) {
+                    distributeTime = DateUtil.formatDateTime(incidentProcess.getCreateTime());
+                }
+                if (StrUtil.isBlank(dealTime) && incidentProcess.getIncidentStatus() == 3 && !StrUtil.contains(incidentProcess.getDes(), "再次派发")) {
+                    dealTime = DateUtil.formatDateTime(incidentProcess.getCreateTime());
+                }
+
                 if (incidentProcess.getStatus() == 1) {
                     // 查询阅读情况
                     JSONObject o = feignNoticeInfoService.messagePushInfoList("1", "2", incidentProcess.getId());
@@ -240,6 +249,9 @@ public class IncidentController extends BaseController {
         map.put("process", list);
         // 物资使用情况
         map.put("resource", resourceDetailService.queryResourceAvailable(id));
+        incidentVo.setDistributeTime(distributeTime);
+        incidentVo.setDealTime(dealTime);
+        map.put("baseInfo", incidentVo);
         return AjaxResult.success(map);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -47,6 +47,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -90,8 +91,11 @@ public class ResourceController extends BaseController {
         }
         // 临时增加处理只能看到该部门的数据
         LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
-        if (cacheLoginUser != null && StrUtil.isNotBlank(cacheLoginUser.getDeptId()) && !StrUtil.containsAny(cacheLoginUser.getUsername(), "sqadmin1", "zhangsan")) {
-            bo.setManageUnitId(cacheLoginUser.getDeptId());
+        // 查询角色如果包含admin的，直接查询全部
+        Set<String> userRole = cacheLoginUser.getUserRole();
+        boolean admin = CollUtil.containsAny(userRole, CollUtil.newHashSet("admin"));
+        if (!admin) {
+            bo.setManageUnitId(cacheLoginUser.getUser().getOrgId());
         }
         return iResourceService.queryPageList(bo);
     }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentVo.java

@@ -191,4 +191,10 @@ public class IncidentVo {
 
     @ApiModelProperty("事件发生时间")
     private Date happenTime;
+
+    /**
+     * 首次派发和处置时间
+     */
+    private String distributeTime;
+    private String dealTime;
 }