From 9494075e6d9d2a4b2b884b4ed740dee0c434734c Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期二, 03 十一月 2026 11:48:44 +0800
Subject: [PATCH] fix(hrm): 修复薪酬核算写错 user_id 导致员工查不到工资条
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
index 2d22beb..9655fc4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
@@ -5,8 +5,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.unit.MesSafetyRiskUnitPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.unit.MesSafetyRiskUnitSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskUnitDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyHazardMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskUnitMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyWorkTicketMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -35,6 +37,12 @@
@Resource
private MesSafetyRiskMapper riskMapper;
+
+ @Resource
+ private MesSafetyHazardMapper hazardMapper;
+
+ @Resource
+ private MesSafetyWorkTicketMapper ticketMapper;
@Override
public PageResult<MesSafetyRiskUnitDO> getRiskUnitPage(MesSafetyRiskUnitPageReqVO pageReqVO) {
@@ -71,6 +79,16 @@
if (riskCount != null && riskCount > 0) {
throw exception(MES_SAFETY_RISK_UNIT_HAS_RISK);
}
+ // 宸茶闅愭偅寮曠敤鐨勫崟鍏冧篃涓嶅厑璁稿垹闄�
+ Long hazardCount = hazardMapper.selectCountByUnitId(id);
+ if (hazardCount != null && hazardCount > 0) {
+ throw exception(MES_SAFETY_HAZARD_HAS_REFERENCE);
+ }
+ // 宸茶浣滀笟绁ㄥ紩鐢ㄧ殑鍗曞厓涔熶笉鍏佽鍒犻櫎
+ Long ticketCount = ticketMapper.selectCountByUnitId(id);
+ if (ticketCount != null && ticketCount > 0) {
+ throw exception(MES_SAFETY_TICKET_HAS_REFERENCE);
+ }
riskUnitMapper.deleteById(id);
}
--
Gitblit v1.9.3