From 28d84bd484ad2f8f1b6f0d0c1999dadea403122f Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 2 Nov 2025 13:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=A0=87=E7=AD=BE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/dao/CourseTagRelationDao.java | 18 ++++++++++++ .../service/impl/CourseTagServiceImpl.java | 28 +++++++++---------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagRelationDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagRelationDao.java index 7cc78aef..02be0d09 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagRelationDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagRelationDao.java @@ -113,4 +113,22 @@ public class CourseTagRelationDao extends BaseDao { .collect(Collectors.toList()); return new PageList(list,totalresults!=null?totalresults.size():0); } + + public void reTagRelDelStatus(String id,String name) { + String sql = "UPDATE boe_course_tag_relation SET deleted =FALSE WHERE id = " + id; + Query query = entityManager.createNativeQuery(sql); + query.setParameter("id", id); + query.setParameter("sysUpdateBy", name); + query.setParameter("sysUpdateTime", LocalDateTime.now()); + query.executeUpdate(); + } + + public void reTypeTagRelDelStatus(String id,String name) { + String sql = "UPDATE boe_course_type_tag_relation SET deleted =FALSE WHERE id = " + id; + Query query = entityManager.createNativeQuery(sql); + query.setParameter("id", id); + query.setParameter("sysUpdateBy", name); + query.setParameter("sysUpdateTime", LocalDateTime.now()); + query.executeUpdate(); + } } 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 9070b659..d73f2867 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 @@ -574,7 +574,7 @@ public class CourseTagServiceImpl implements ICourseTagService { List filters = new ArrayList<>(); filters.add(FieldFilters.eq("courseId", Long.valueOf(courseId))); filters.add(FieldFilters.eq("tagId", Long.valueOf(tag.getId()))); - filters.add(FieldFilters.eq("deleted", false)); +// filters.add(FieldFilters.eq("deleted", false)); query.addFilters(filters); List existingRelations = courseTagRelationDao.findList(query.builder()); @@ -601,13 +601,12 @@ public class CourseTagServiceImpl implements ICourseTagService { // 恢复已删除的关联关系 CourseTagRelation relation = existingRelations.get(0); if (relation.getDeleted()) { - relation.setDeleted(false); - + courseTagRelationDao.reTagRelDelStatus(relation.getId(),userInfo.getName()); +// relation.setDeleted(false); // 设置更新信息 - relation.setSysUpdateBy(userInfo.getName()); - relation.setSysUpdateTime(now); - - courseTagRelationDao.saveOrUpdate(relation); +// relation.setSysUpdateBy(userInfo.getName()); +// relation.setSysUpdateTime(now); +// courseTagRelationDao.saveOrUpdate(relation); } } log.debug("完成课程-标签关联关系创建: courseId={}, tagId={}", courseId, tag != null ? tag.getId() : "null"); @@ -651,7 +650,7 @@ public class CourseTagServiceImpl implements ICourseTagService { filters.add(FieldFilters.eq("sysType2", sysType2)); filters.add(FieldFilters.eq("sysType3", sysType3)); filters.add(FieldFilters.eq("tagId", tagId)); - filters.add(FieldFilters.eq("deleted", false)); +// filters.add(FieldFilters.eq("deleted", false)); query.addFilters(filters); List existingRelations = courseTypeTagRelationDao.findList(query.builder()); @@ -680,13 +679,12 @@ public class CourseTagServiceImpl implements ICourseTagService { // 恢复已删除的关联关系 CourseTypeTagRelation relation = existingRelations.get(0); if (relation.getDeleted()) { - relation.setDeleted(false); - - // 设置更新信息 - relation.setSysUpdateBy(userInfo.getName()); - relation.setSysUpdateTime(now); - - courseTypeTagRelationDao.saveOrUpdate(relation); + courseTagRelationDao.reTypeTagRelDelStatus(relation.getId(),userInfo.getName()); +// relation.setDeleted(false); +// // 设置更新信息 +// relation.setSysUpdateBy(userInfo.getName()); +// relation.setSysUpdateTime(now); +// courseTypeTagRelationDao.saveOrUpdate(relation); } } }