From 8ad863082097ffdcab4a8e7f426d344a1fe6f892 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:27:02 +0800
Subject: [PATCH] 修复人员管理接口校验与导出,完善设备保养计划与文件受控功能

---
 cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
index e25a6e0..93d8a98 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
@@ -96,8 +96,17 @@
     public Result<?> addOrUpdatePersonTrainingDetailed(@RequestBody PersonTrainingDetailed personTrainingDetailed) {
         if (ObjectUtils.isEmpty(personTrainingDetailed.getId())) {
             personTrainingDetailed.setState(3);
+            personTrainingDetailedService.save(personTrainingDetailed);
+            return Result.success();
         }
-        personTrainingDetailedService.saveOrUpdate(personTrainingDetailed);
+        // 璁插笀鍙兘鍦ㄥ唴閮ㄤ汉鍛樺拰澶栬仒浜哄憳涔嬮棿鍒囨崲锛屽厛鏄惧紡瑕嗙洊涓ゅ垪锛岄伩鍏� updateById 璺宠繃 null 瀵艰嚧鏃у�兼畫鐣�
+        personTrainingDetailedService.update(null, Wrappers.<PersonTrainingDetailed>lambdaUpdate()
+                .eq(PersonTrainingDetailed::getId, personTrainingDetailed.getId())
+                .set(PersonTrainingDetailed::getTrainingLecturerId, personTrainingDetailed.getTrainingLecturerId())
+                .set(PersonTrainingDetailed::getTrainingLecturerName, personTrainingDetailed.getTrainingLecturerName()));
+        personTrainingDetailed.setTrainingLecturerId(null);
+        personTrainingDetailed.setTrainingLecturerName(null);
+        personTrainingDetailedService.updateById(personTrainingDetailed);
         return Result.success();
     }
 

--
Gitblit v1.9.3