From 2467e1193c505d344c31a37e6fd9a269d7b98987 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 17:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
index c88625a..78a8613 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -57,16 +57,14 @@
baseMapper.insert(entity);
List<Integer> teacherList = form.getTeacherList();
- if (CollectionUtils.isEmpty(teacherList)) {
- teacherList = new ArrayList<>(1);
- }
- teacherList.add(webContext.getCurrentUser().getId());
- for (Integer teacherUserId : teacherList) {
- ClassesUser classesUser = new ClassesUser();
- classesUser.setClassesId(entity.getId());
- classesUser.setUserId(teacherUserId);
- classesUser.setTeacher(Boolean.TRUE);
- classesUserService.save(classesUser);
+ if (! CollectionUtils.isEmpty(teacherList)) {
+ for (Integer teacherUserId : teacherList) {
+ ClassesUser classesUser = new ClassesUser();
+ classesUser.setClassesId(entity.getId());
+ classesUser.setUserId(teacherUserId);
+ classesUser.setTeacher(Boolean.TRUE);
+ classesUserService.save(classesUser);
+ }
}
return Result.ok("娣诲姞鎴愬姛");
}
@@ -91,16 +89,14 @@
.eq(ClassesUser::getTeacher, Boolean.TRUE)
.remove();
List<Integer> teacherList = form.getTeacherList();
- if (CollectionUtils.isEmpty(teacherList)) {
- teacherList = new ArrayList<>(1);
- }
- teacherList.add(webContext.getCurrentUser().getId());
- for (Integer teacherUserId : teacherList) {
- ClassesUser classesUser = new ClassesUser();
- classesUser.setClassesId(entity.getId());
- classesUser.setUserId(teacherUserId);
- classesUser.setTeacher(Boolean.TRUE);
- classesUserService.save(classesUser);
+ if (! CollectionUtils.isEmpty(teacherList)) {
+ for (Integer teacherUserId : teacherList) {
+ ClassesUser classesUser = new ClassesUser();
+ classesUser.setClassesId(entity.getId());
+ classesUser.setUserId(teacherUserId);
+ classesUser.setTeacher(Boolean.TRUE);
+ classesUserService.save(classesUser);
+ }
}
return Result.ok("淇敼鎴愬姛");
}
--
Gitblit v1.8.0