diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
index a7143440..feec1e50 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
@@ -283,6 +283,12 @@ public class CourseManageApi extends ApiBaseController{
 		
 		//填充必要的信息
 		try {
+			log.info("-------- 标签相关开始 -------");
+			CurrentUser userInfo = getCurrent();
+			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? courseService.get(dto.getCourse().getId()) : null;
+			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
+			log.info("-------- 标签相关结束 -------");
+
 			if(StringUtils.isBlank(dto.getCourse().getId())) {
 				//只有在第一次添加保存时才会这样
 				fillCourseData(dto.getCourse());
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java
index d5877ee9..bb38a374 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java
@@ -511,11 +511,11 @@ public class CourseTagServiceImpl implements ICourseTagService {
 
             // 设置创建信息
             relation.setSysCreateAid(userInfo.getAccountId());
-            relation.setSysCreateBy(userInfo.getNickName());
+            relation.setSysCreateBy(userInfo.getName());
             relation.setSysCreateTime(now);
 
             // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getNickName());
+            relation.setSysUpdateBy(userInfo.getName());
             relation.setSysUpdateTime(now);
 
             courseTagRelationDao.save(relation);
@@ -526,7 +526,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
                 relation.setDeleted(false);
 
                 // 设置更新信息
-                relation.setSysUpdateBy(userInfo.getNickName());
+                relation.setSysUpdateBy(userInfo.getName());
                 relation.setSysUpdateTime(now);
 
                 courseTagRelationDao.saveOrUpdate(relation);
@@ -543,16 +543,12 @@ public class CourseTagServiceImpl implements ICourseTagService {
         String sysType3 = course.getSysType3();
 
         // 根据分类级别创建相应的关联关系
-        if (StringUtils.isNotBlank(sysType1)) {
-            createSingleCourseTypeTagRelation(sysType1, "0", "0", tag.getId(), userInfo);
-        }
-
-        if (StringUtils.isNotBlank(sysType2)) {
-            createSingleCourseTypeTagRelation(sysType1, sysType2, "0", tag.getId(), userInfo);
-        }
-
         if (StringUtils.isNotBlank(sysType3)) {
             createSingleCourseTypeTagRelation(sysType1, sysType2, sysType3, tag.getId(), userInfo);
+        }else if (StringUtils.isNotBlank(sysType2)) {
+            createSingleCourseTypeTagRelation(sysType1, sysType2, "0", tag.getId(), userInfo);
+        }else if (StringUtils.isNotBlank(sysType1)) {
+            createSingleCourseTypeTagRelation(sysType1, "0", "0", tag.getId(), userInfo);
         }
     }
 
@@ -584,11 +580,11 @@ public class CourseTagServiceImpl implements ICourseTagService {
 
             // 设置创建信息
             relation.setSysCreateAid(userInfo.getAccountId());
-            relation.setSysCreateBy(userInfo.getNickName());
+            relation.setSysCreateBy(userInfo.getName());
             relation.setSysCreateTime(now);
 
             // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getNickName());
+            relation.setSysUpdateBy(userInfo.getName());
             relation.setSysUpdateTime(now);
 
             courseTypeTagRelationDao.save(relation);
@@ -599,7 +595,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
                 relation.setDeleted(false);
 
                 // 设置更新信息
-                relation.setSysUpdateBy(userInfo.getNickName());
+                relation.setSysUpdateBy(userInfo.getName());
                 relation.setSysUpdateTime(now);
 
                 courseTypeTagRelationDao.saveOrUpdate(relation);
@@ -624,7 +620,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
             CourseTagRelation relation = relations.get(0);
 
             // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getNickName());
+            relation.setSysUpdateBy(userInfo.getName());
             relation.setSysUpdateTime(LocalDateTime.now());
 
             // 逻辑删除关联关系
@@ -636,7 +632,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
                 tag.setUseCount(Math.max(0, tag.getUseCount() - 1));
 
                 // 设置更新信息
-                tag.setSysUpdateBy(userInfo.getNickName());
+                tag.setSysUpdateBy(userInfo.getName());
                 tag.setSysUpdateTime(LocalDateTime.now());
 
                 courseTagDao.update(tag);
@@ -673,7 +669,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
 
             for (CourseTypeTagRelation relation : typeRelations) {
                 // 设置更新信息
-                relation.setSysUpdateBy(userInfo.getNickName());
+                relation.setSysUpdateBy(userInfo.getName());
                 relation.setSysUpdateTime(now);
 
                 courseTypeTagRelationDao.setDeleted(relation.getId());
@@ -707,7 +703,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
         }
 
         // 设置更新信息
-        tag.setSysUpdateBy(userInfo.getNickName());
+        tag.setSysUpdateBy(userInfo.getName());
         tag.setSysUpdateTime(now);
 
         courseTagDao.update(tag);
@@ -747,9 +743,9 @@ public class CourseTagServiceImpl implements ICourseTagService {
     private void setCreateInfo(BaseEntity entity, CurrentUser userInfo) {
         LocalDateTime now = LocalDateTime.now();
         entity.setSysCreateAid(userInfo.getAccountId());
-        entity.setSysCreateBy(userInfo.getNickName());
+        entity.setSysCreateBy(userInfo.getName());
         entity.setSysCreateTime(now);
-        entity.setSysUpdateBy(userInfo.getNickName());
+        entity.setSysUpdateBy(userInfo.getName());
         entity.setSysUpdateTime(now);
     }
 
@@ -757,7 +753,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
      * 设置实体的更新信息（编辑时使用）
      */
     private void setUpdateInfo(BaseEntity entity, CurrentUser userInfo) {
-        entity.setSysUpdateBy(userInfo.getNickName());
+        entity.setSysUpdateBy(userInfo.getName());
         entity.setSysUpdateTime(LocalDateTime.now());
     }