add：日志中没有最新的总指挥数据

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

@@ -215,7 +215,7 @@ public class IncidentController extends BaseController {
                 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(), "再次派发")) {
+                if (StrUtil.isBlank(dealTime) && incidentProcess.getIncidentStatus() == 3) {
                     dealTime = DateUtil.formatDateTime(incidentProcess.getCreateTime());
                 }
                 if (StrUtil.isBlank(dealEndTime) && incidentProcess.getIncidentStatus() == 6 && StrUtil.contains(incidentProcess.getDes(), "事件办结")) {
@@ -269,18 +269,8 @@ public class IncidentController extends BaseController {
         List<IncidentProcess> list = processService.list(Wrappers.<IncidentProcess>lambdaQuery()
             .eq(IncidentProcess::getIncidentId, id)
             .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());

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -226,7 +226,7 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
                 throw new ServiceException("请选择总指挥！");
             }*/
             if (StrUtil.isNotBlank(bo.getCommanderUser())) {
-                List<MessagePushUser> commandUser = JSONUtil.toList(StrUtil.blankToDefault(beforeInfo.getCommanderUser(), "[]"), MessagePushUser.class);
+                List<MessagePushUser> commandUser = JSONUtil.toList(StrUtil.blankToDefault(bo.getCommanderUser(), "[]"), MessagePushUser.class);
                 if (commandUser.size() > 0) {
                     bo.setCommander(commandUser.get(0).getUserId());
                     update.setCommanderText(commandUser.get(0).getNickName());
@@ -334,7 +334,7 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
                 task.setTaskSend("1");
                 incidentTaskService.insertByBo(task);
 
-                sendJsonObject.set("des", "再次派发总指挥及协办部门");
+                sendJsonObject.set("des", "发送总指挥及协办部门");
                 sendJsonObject.set("incidentStatus", bo.getStatus());
                 sendJsonObject.set("incidentId", bo.getId());
                 sendJsonObject.set("messagePushUsers", sendUser);