身份登录bug

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);
+
     }
 }

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("获取用户信息失败！");
     }
 }

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();

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/
+student.teacher.url = http://116.205.131.177:8080/