From 077000f454e9133eef2bec08009ba66a9634c9a5 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 27 Oct 2022 23:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ibeetl/jlw/service/StudentService.java | 14 ++++++++------
.../com/ibeetl/jlw/service/TeacherService.java | 16 +++++++++-------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
index 12028b1b..3adc8970 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
@@ -524,20 +524,22 @@ public class StudentService extends CoreBaseService<Student>{
String schoolClassId = "";
// 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校
- SchoolClass schoolClass = schoolClassDao.createLambdaQuery()
+ List<SchoolClass> schoolClass = schoolClassDao.createLambdaQuery()
.andEq(SchoolClass::getClassName, className)
.andEq(SchoolClass::getClassStatus, 1)
- .unique();
+ .select();
+
+ Assert.notEmpty(schoolClass, "未查询到班级，请先添加班级信息！");
// 通过名字没查询到院校的时候
if(ObjectUtil.isEmpty(schoolClass)) {
// 正则取院校ID
schoolClassId = ReUtil.get("\\d+", className, 0);
- Assert.notBlank(schoolClassId, "未查询到院校，请先添加院校信息！");
+ Assert.notBlank(schoolClassId, "请先添加班级信息！");
}
// 这个时候院校ID一定存在
- schoolClassId = schoolClass.getClassId().toString();
+ schoolClassId = schoolClass.get(0).getClassId().toString();
Student pojo = new Student();
@@ -577,7 +579,7 @@ public class StudentService extends CoreBaseService<Student>{
coreUser.setState("S1");
coreUser.setDelFlag(0);
coreUser.setCreateTime(date);
- coreUser.setOrgId(schoolClass.getOrgId());
+ coreUser.setOrgId(schoolClass.get(0).getOrgId());
coreUser.setPassword("123qwe");
userConsoleService.saveUser(coreUser);
@@ -585,7 +587,7 @@ public class StudentService extends CoreBaseService<Student>{
s.setStudentId(pojo.getStudentId());
s.setStudentSn(studentSn);
s.setUserId(coreUser.getId());
- s.setOrgId(schoolClass.getOrgId());
+ s.setOrgId(schoolClass.get(0).getOrgId());
this.updateTemplate(s);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java
index 99685801..0e90ef06 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java
@@ -372,20 +372,22 @@ public class TeacherService extends CoreBaseService<Teacher> {
String universitiesCollegesId = "";
// 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校
- UniversitiesColleges universitiesColleges = universitiesCollegesDao.createLambdaQuery()
+ List<UniversitiesColleges> universitiesColleges = universitiesCollegesDao.createLambdaQuery()
.andEq(UniversitiesColleges::getUniversitiesCollegesName, universitiesCollegesName)
.andEq(UniversitiesColleges::getUniversitiesCollegesStatus, 1)
- .unique();
+ .select();
+
+ Assert.notEmpty(universitiesColleges, "未查询到院校，请先添加院校信息！");
// 通过名字没查询到院校的时候
if(ObjectUtil.isEmpty(universitiesColleges)) {
// 正则取院校ID
universitiesCollegesId = ReUtil.get("\\d+", universitiesCollegesName, 0);
- Assert.notBlank(universitiesCollegesId, "未查询到院校，请先添加院校信息！");
+ Assert.notBlank(universitiesCollegesId, "请先添加院校信息！");
}
// 这个时候院校ID一定存在
- universitiesCollegesId = universitiesColleges.getUniversitiesCollegesId().toString();
+ universitiesCollegesId = universitiesColleges.get(0).getUniversitiesCollegesId().toString();
Teacher pojo = new Teacher();
@@ -423,7 +425,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
coreUser.setState("S1");
coreUser.setDelFlag(0);
coreUser.setCreateTime(date);
- coreUser.setOrgId(universitiesColleges.getOrgId());
+ coreUser.setOrgId(universitiesColleges.get(0).getOrgId());
coreUser.setPassword("123qwe");
userConsoleService.saveUser(coreUser);
@@ -431,14 +433,14 @@ public class TeacherService extends CoreBaseService<Teacher> {
CoreUserRole coreUserRole = new CoreUserRole();
coreUserRole.setRoleId(191L);
coreUserRole.setUserId(coreUser.getId());
- coreUserRole.setOrgId(universitiesColleges.getOrgId());
+ coreUserRole.setOrgId(universitiesColleges.get(0).getOrgId());
coreUserRole.setCreateTime(date);
coreUserRoleDao.insert(coreUserRole);
Teacher t = new Teacher();
t.setTeacherId(pojo.getTeacherId());
t.setUserId(coreUser.getId());
- t.setOrgId(universitiesColleges.getOrgId());
+ t.setOrgId(universitiesColleges.get(0).getOrgId());
this.updateTemplate(t);