1

admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java

@@ -96,6 +96,24 @@ public class CacheConfig extends CachingConfigurerSupport {
 	public RedisCacheManager cacheManager5Second(RedisTemplate redisTemplate) {
 		return create(redisTemplate, 5L);
 	}
+	/**
+	 * 过期时间10秒
+	 * @param redisTemplate
+	 * @return
+	 */
+	@Bean
+	public RedisCacheManager cacheManager10Second(RedisTemplate redisTemplate) {
+		return create(redisTemplate, 10L);
+	}
+	/**
+	 * 过期时间20秒
+	 * @param redisTemplate
+	 * @return
+	 */
+	@Bean
+	public RedisCacheManager cacheManager20Second(RedisTemplate redisTemplate) {
+		return create(redisTemplate, 20L);
+	}
 
 	private RedisCacheManager create(RedisTemplate redisTemplate, Long ttl) {
 		RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(redisTemplate.getConnectionFactory());
@@ -204,9 +222,9 @@ public class CacheConfig extends CachingConfigurerSupport {
 			} else {
 				// 二级缓存取
 				wrapper = redisCache.get(key);
-//				if (wrapper != null) {
-//					local.put(key, wrapper);
-//				}
+				if (wrapper != null) {
+					local.put(key, wrapper);
+				}
 
 				return wrapper;
 			}

admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html

@@ -9,7 +9,7 @@
 if(has(readonly)){
 	var dicts = [];
 	var selectedDict = null;
-	var forceClearVar = !isNotEmpty(forceClear) ? true : @java.lang.Boolean.parseBoolean(forceClear);
+	var forceClearVar = isNotEmpty(forceClear) && @java.lang.Boolean.parseBoolean(forceClear);
 	if(isNotEmpty(type)){
 		dicts = dict.dictDownQuery(type, forceClearVar);
 	}else if(isNotEmpty(group)&&isNotEmpty(value)){
@@ -32,7 +32,7 @@ if(has(readonly)){
 	<option  value="">全部</option>
 	<!--# 
 		var dicts = [];
-		var forceClearVar = !isNotEmpty(forceClear) ? true : @java.lang.Boolean.parseBoolean(forceClear);
+		var forceClearVar = isNotEmpty(forceClear) && @java.lang.Boolean.parseBoolean(forceClear);
 		if(isNotEmpty(type)){
 			dicts = dict.dictDownQuery(type, forceClearVar);
 		}else if(isNotEmpty(group)&&isNotEmpty(value)){

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -947,6 +947,12 @@ public class StudentService extends CoreBaseService<Student>{
             schoolClassQuery.setUniversitiesCollegesId(universitiesCollegesId);
             List<SchoolClass> classList = schoolClassDao.getValuesByQuery(schoolClassQuery);
             List<Long> classIds = classList.stream().map(SchoolClass::getClassId).collect(Collectors.toList());
+
+            // 如果院校没有班级，则肯定没有学生
+            if (classIds == null || classIds.isEmpty()) {
+                return Collections.emptyList();
+            }
+
             lambdaQuery.andIn(Student::getClassId, classIds);
         }
         return lambdaQuery.andEq(Student::getStudentStatus, 1).select();

web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java

@@ -5,6 +5,7 @@ import cn.jlw.Interceptor.SCoreUser;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.FileEntity;
@@ -50,6 +51,8 @@ public class CourseInfoController{
 
     @Autowired
     FileService fileService;
+    @Autowired
+    private CorePlatformService corePlatformService;
 
     //初始化树缓存
     public static void init(CourseInfoService courseInfoService){
@@ -205,6 +208,7 @@ public class CourseInfoController{
         CourseInfo courseInfo = courseInfoService.add(courseInfoQuery);
         //移除缓存
         courseInfoService.flushCache(courseInfo.getCourseInfoId());
+        corePlatformService.clearDictCache();
         return JsonResult.success();
 
     }
@@ -217,6 +221,7 @@ public class CourseInfoController{
         if (success) {
             //移除缓存
             courseInfoService.flushCache(courseInfoQuery.getCourseInfoId());
+            corePlatformService.clearDictCache();
             return JsonResult.success();
         } else {
             return JsonResult.failMessage("更新失败");
@@ -243,6 +248,7 @@ public class CourseInfoController{
     @ResponseBody
     public JsonResult delete(String ids) {
         courseInfoService.deleteCourseInfo(ids);
+        corePlatformService.clearDictCache();
         return JsonResult.success();
     }