From 61de6e2aa18106e661eef90e98d13460b11b143a Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 28 Oct 2022 22:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E7=99=BB=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...penCourseMergeResourcesQuestionService.java | 4 +++-
.../ibeetl/jlw/service/WebPlatformService.java | 9 ++++++---
.../com/ibeetl/jlw/web/IndexController.java | 18 ++++++++----------
.../main/resources/application-prod.properties | 2 +-
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
index e61bf74d..91e81fc3 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
import java.io.*;
import java.math.BigDecimal;
import java.util.*;
@@ -366,7 +367,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
* @param resourcesQuestionIds
* @return
*/
- public void copyFromQuestion(Set<String> resourcesQuestionIds) {
+ public void copyFromQuestion(@NotEmpty(message = "资源题目ID不能为空！") Set<String> resourcesQuestionIds) {
// 题目ID集合
String ids = join(resourcesQuestionIds, ",");
List<ResourcesQuestion> resourcesQuestions = resourcesQuestionDao.getByIds(ids);
@@ -375,5 +376,6 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
// 默认有
List<TeacherOpenCourseMergeResourcesQuestion> copyToList = BeanUtil.copyToList(resourcesQuestions, TeacherOpenCourseMergeResourcesQuestion.class);
+
}
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
index 9f2bdc2c..8483dec1 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
@@ -4,7 +4,6 @@ import cn.hutool.core.util.EnumUtil;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.enums.MenuEnums;
import com.ibeetl.admin.core.util.HttpRequestLocal;
-import com.ibeetl.admin.core.util.PlatformException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,6 +45,9 @@ public class WebPlatformService {
case JT_S_04: {
httpRequestLocal.setSessionValue(T_COLLEGES_ADMIN, universitiesCollegesService.getByUserId(userId));
}break;
+ default: {
+ httpRequestLocal.setSessionValue(ACCESS_CURRENT_USER, user);
+ } break;
}
}
@@ -67,8 +69,9 @@ public class WebPlatformService {
case JT_S_04: {
return httpRequestLocal.getSessionValue(T_COLLEGES_ADMIN);
}
+ default: {
+ return httpRequestLocal.getSessionValue(ACCESS_CURRENT_USER);
+ }
}
-
- throw new PlatformException("获取用户信息失败！");
}
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
index 464bac95..31794e32 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java
@@ -829,16 +829,6 @@ public class IndexController {
switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) {
-
- // 超管和学校管理员
- case JT_S_01:
- case JT_S_04: {
- // 记录登录信息到session
- this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
- // 登录信息存放Session。这里可能是学校管理员
- webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
- } break;
-
// 教师
case JT_S_02: {
@@ -919,6 +909,14 @@ public class IndexController {
return JsonResult.success(keyId);
}
} break;
+
+ // 超管，学校管理员登其他身份登录后台。
+ default: {
+ // 记录登录信息到session
+ this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
+ // 登录信息存放Session。这里可能是学校管理员
+ webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
+ } break;
}
return JsonResult.success();
diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties
index ff744acd..54a8e5e0 100644
--- a/web/src/main/resources/application-prod.properties
+++ b/web/src/main/resources/application-prod.properties
@@ -66,4 +66,4 @@ dynamic.beetlsql.cs.dbStyle = org.beetl.sql.core.db.MySqlStyle
dynamic.beetlsql.cs.dynamicConnectionSource = master,ds2
#\u6559\u5E08\u7AEF\u548C\u5B66\u751F\u7AEF\u7684\u767B\u5F55\u5730\u5740
-student.teacher.url = http://localhost:8080/
\ No newline at end of file
+student.teacher.url = http://116.205.131.177:8080/
\ No newline at end of file