From 5f790dcd25f344eb3e2bd9848d53d02b0074afbe Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 15 Nov 2022 17:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=95=99=E5=B8=88=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/module/course/dto/CourseContentDto.java |  5 +++++
 .../service/impl/CourseContentServiceImpl.java   |  9 ++++++++-
 .../course/service/impl/CourseServiceImpl.java   | 16 +++++++---------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseContentDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseContentDto.java
index 00a76968..43b20993 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseContentDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseContentDto.java
@@ -12,6 +12,11 @@ import lombok.Data;
  */
 @Data
 public class CourseContentDto {
+	
+	/**
+	 * 类型，10无目录课程，20有目录课程
+	 */
+	private Integer type;//
 
 	private CourseContent content;
 	
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
index 62a39ec1..c2cc351d 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
@@ -52,13 +52,19 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		CourseExam exam=dto.getExam();
 		CourseHomeWork homework=dto.getHomework();
 		
-		
 		if(StringUtils.isBlank(cc.getId())) {
 			//新增的情况
 			cc.setDeleted(false);
 			if(cc.getDuration()==null) {
 				cc.setDuration(0);
 			}
+			//如果是没有目录的，并具是课程内容
+			if(dto.getType()!=null && dto.getType()==10) {
+				if(cc.getSortIndex()==1) {
+					//先删除之前其它的
+					ccDao.deleteByField("courseId",cc.getCourseId());
+				}
+			}
 			ccDao.save(cc);
 		}else {
 			ccDao.update(cc);
@@ -113,6 +119,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		List<CourseContent> list=ccDao.findList(OrderCondition.asc("sortIndex"),
 				FieldFilters.eq("courseId", courseId),
 				FieldFilters.eq("deleted", false));
+		
 		return list;
 	}
 
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 f001b693..69780a79 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
@@ -671,13 +671,13 @@ public class CourseServiceImpl implements ICourseService {
 		full.getCourse().setSysVersion(c.getSysVersion());
 		
 		//先清空教师信息， 教师信息如果不一样了，也要加入到日志中
-//		courseTeacherDao.deleteByField("courseId", c.getId());
-//		if(full.getTeachers()!=null && !full.getTeachers().isEmpty()) {
-//			for(CourseTeacher ct : full.getTeachers()) {
-//				ct.setCourseId(c.getId());
-//				courseTeacherDao.saveOrUpdate(ct);
-//			}
-//		}
+		courseTeacherDao.deleteByField("courseId", c.getId());
+		if(full.getTeachers()!=null && !full.getTeachers().isEmpty()) {
+			for(CourseTeacher ct : full.getTeachers()) {
+				ct.setCourseId(c.getId());
+				courseTeacherDao.saveOrUpdate(ct);
+			}
+		}
 		//先清空受众信息,受众信息如果不一样了，也要加入到日志中
 		courseCrowdDao.deleteByField("courseId", c.getId());
 		if(full.getCrowds()!=null && !full.getCrowds().isEmpty()) {
@@ -695,8 +695,6 @@ public class CourseServiceImpl implements ICourseService {
 		hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
 		hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);
 		courseHRBPAuditDao.save(hrbpAudit);
-
-		
 	}
 	
 	@Override