From 7846943f93d395ca3e9abef8c2d87154bd77697c Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 24 Jul 2024 18:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B=E5=9C=A8?=
 =?UTF-8?q?=E6=96=BD=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=97=81=E7=AB=99=E8=AE=B0=E5=BD=95=E7=AD=89=E6=8F=90=E9=86=92?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/DangerousEngineeringRecordTask.java  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/DangerousEngineeringRecordTask.java b/src/main/java/com/zhgd/xmgl/task/DangerousEngineeringRecordTask.java
index a5f6c6a1e..acd51474d 100644
--- a/src/main/java/com/zhgd/xmgl/task/DangerousEngineeringRecordTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/DangerousEngineeringRecordTask.java
@@ -3,7 +3,6 @@ package com.zhgd.xmgl.task;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhgd.xmgl.constant.Cts;
 import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
 import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
 import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord;
@@ -68,24 +67,21 @@ public class DangerousEngineeringRecordTask {
                 .eq(DangerousEngineeringRecord::getFinalAcceptanceStatus, 1)
         );
         for (DangerousEngineeringRecord record : list) {
-            String personLiable = record.getPersonLiable();
-            if (StrUtil.isBlank(personLiable)) {
+            Long personLiable = record.getPersonLiableId();
+            if (personLiable == null) {
                 continue;
             }
-            List<String> personIds = StrUtil.split(personLiable, Cts.COMMA);
             String title1 = "在施危大工程上传旁站记录提醒";
             String title2 = "在施危大工程上传排查记录提醒";
             String msg1 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传旁站记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime());
             String msg2 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传排查记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime());
-            for (String personId : personIds) {
-                noticeService.addUserNotice(Long.valueOf(personId), title1,
-                        msg1, "2");
-                noticeService.addUserNotice(Long.valueOf(personId), title2,
-                        msg2, "2");
+            noticeService.addUserNotice(personLiable, title1,
+                    msg1, "2");
+            noticeService.addUserNotice(personLiable, title2,
+                    msg2, "2");
 
-            }
-            noticeService.addProjectLevelNotice(record.getProjectSn(), title1, systemUserService.getFrameUserNames(personLiable) + msg1, "2", null);
-            noticeService.addProjectLevelNotice(record.getProjectSn(), title2, systemUserService.getFrameUserNames(personLiable) + msg2, "2", null);
+            noticeService.addProjectLevelNotice(record.getProjectSn(), title1, systemUserService.getFrameUserNames(String.valueOf(personLiable)) + msg1, "2", null);
+            noticeService.addProjectLevelNotice(record.getProjectSn(), title2, systemUserService.getFrameUserNames(String.valueOf(personLiable)) + msg2, "2", null);
         }
     }