From bc31cda78817c62aa552be40f39eccaa03262923 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:22 +0800
Subject: [PATCH] feat: 补齐排产约束与缺料校验，新增风险监测，优化隐患通知与招投标联动
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
index e52c09e..38fe9d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
@@ -101,8 +101,12 @@
throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED);
}
var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED);
- if (assignee.getUserId() == null) throw exception(SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT);
- adminUserService.validateUserList(List.of(assignee.getUserId()));
+ Long notifyUserId = assignee.getUserId() != null ? assignee.getUserId() : reqVO.getNotifyUserId();
+ if (notifyUserId == null) throw exception(SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT);
+ if (assignee.getUserId() != null && reqVO.getNotifyUserId() != null && !assignee.getUserId().equals(reqVO.getNotifyUserId())) {
+ throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException("璐ｄ换浜哄凡缁戝畾璐﹀彿锛岄�氱煡鎺ユ敹璐﹀彿蹇呴』涓庡叾涓�鑷�");
+ }
+ adminUserService.validateUserList(List.of(notifyUserId));
SafetyHazardDO update = new SafetyHazardDO();
update.setId(hazard.getId());
update.setAssigneeId(assignee.getId());
@@ -115,7 +119,7 @@
}
hazardMapper.updateById(update);
NotifySendSingleToUserReqDTO notice = new NotifySendSingleToUserReqDTO();
- notice.setUserId(assignee.getUserId());
+ notice.setUserId(notifyUserId);
notice.setTemplateCode("safety_hazard_assigned");
notice.setTemplateParams(Map.of("code", hazard.getCode(), "title", hazard.getTitle(),
"deadline", reqVO.getRectifyDeadline() == null ? "鏈缃�" : reqVO.getRectifyDeadline().toString()));
--
Gitblit v1.9.3