From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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..6f47b44 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("淇敼鎴愬姛");
}
@@ -186,9 +182,14 @@
@Override
public Result myClassList() {
Integer userId = webContext.getCurrentUser().getId();
+ List<ClassesUser> classes = new LambdaQueryChainWrapper<>(classesUserService.getBaseMapper())
+ .eq(ClassesUser::getTeacher, Boolean.TRUE)
+ .eq(ClassesUser::getUserId, userId)
+ .list();
+ List<Integer> classesIds = classes.stream().map(ClassesUser::getClassesId).collect(Collectors.toList());
List<Classes> list = new LambdaQueryChainWrapper<>(baseMapper)
.select(Classes::getId, Classes::getClassName)
- .eq(Classes::getCreateUser, userId)
+ .in(Classes::getId, classesIds)
.list();
return Result.ok(list);
}
--
Gitblit v1.8.0