From a6335abcc7524f0bd8ac1c3f025817d56db717b4 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Tue, 18 Nov 2025 18:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BE=E7=A8=8B=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=8F=90=E5=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course/service/impl/CourseServiceImpl.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
index 7cbe7b7f..feb21711 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
@@ -1028,13 +1028,12 @@ public class CourseServiceImpl implements ICourseService {
         }*/
 
         if (!nowCourse.getSysVersion().equals(c.getSysVersion())) {
-            log.warn("乐观锁冲突 - 课程ID: {}, 期望版本: {}, 实际版本: {}",
+            log.warn(" - 课程ID: {}, 期望版本: {}, 实际版本: {}",
                     c.getId(), c.getSysVersion(), nowCourse.getSysVersion());
-//            throw new RuntimeException("数据已被其他用户修改，请刷新页面后重试");
             // 基本无概率同时修改同一课程 如有 以最后提交为准
             c.setSysVersion(courseDao.getVersion(c.getId()));
         }
-
+        log.info("-------- 课程保存 update ------- tag = {} " , c.getTags());
         courseDao.update(c);
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
@@ -1132,6 +1131,13 @@ public class CourseServiceImpl implements ICourseService {
         Course c = full.getCourse();//当前的课程信息
         c.setPublished(true);
         c.setPublishTime(LocalDateTime.now());
+        Course nowCourse = courseDao.get(c.getId());
+        if (!nowCourse.getSysVersion().equals(c.getSysVersion())) {
+            log.warn(" - 课程ID: {}, 期望版本: {}, 实际版本: {}",
+                    c.getId(), c.getSysVersion(), nowCourse.getSysVersion());
+            // 基本无概率同时修改同一课程 如有 以最后提交为准
+            c.setSysVersion(courseDao.getVersion(c.getId()));
+        }
         courseDao.update(c);
 
         // 兼容处理，记录下删除的关联数据