修复 首页数据不对的问题；

修复 课程配置，课程标签下拉查询；
修复 新增课程，授权列表未及时更新的问题。

admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java

@@ -426,7 +426,7 @@ public class CorePlatformService {
     }
 
     @CacheEvict(cacheNames = { DICT_CACHE_CHILDREN, DICT_CACHE_SAME_LEVEL, DICT_CACHE_TYPE,
-            DICT_CACHE_VALUE, DICT_CACHE_FIND_PK_AND_VALUE, DICT_CACHE_FIND_ALL_LIST_BY_TABLE }, allEntries = true )
+            DICT_CACHE_VALUE, DICT_CACHE_FIND_PK_AND_VALUE, DICT_CACHE_FIND_ALL_LIST_BY_TABLE, "cache:core:getResourcesCourseInfoAuthDetails" }, allEntries = true )
     public void clearDictCache() {
         log.info("clearDictCache...");
     }

doc/sql/mysql/1.tianze-pro.sql

@@ -3520,7 +3520,7 @@ INSERT INTO `core_dict` VALUES (23, 'R1', '工作流角色', 'role_type', '用
 INSERT INTO `core_dict` VALUES (24, 'S0', '禁用', 'user_state', '用户状态', 2, NULL, 0, NULL, NULL);
 INSERT INTO `core_dict` VALUES (25, 'S1', '启用', 'user_state', '用户状态', 1, NULL, 0, NULL, NULL);
 INSERT INTO `core_dict` VALUES (189, '1', '上架', 'up_status', '上架状态', NULL, NULL, 0, '', '2022-09-06 22:51:05.180000');
-INSERT INTO `core_dict` VALUES (190, '0', '下架', 'up_status', '上架状态', NULL, NULL, 0, '', '2022-09-06 22:51:12.135000');
+INSERT INTO `core_dict` VALUES (190, '2', '下架', 'up_status', '上架状态', NULL, NULL, 0, '', '2022-09-06 22:51:12.135000');
 INSERT INTO `core_dict` VALUES (191, '1', '视频', 'resources_info_type', '资源类型', NULL, NULL, 0, '', '2022-09-06 22:53:32.361000');
 INSERT INTO `core_dict` VALUES (192, '2', 'PPT', 'resources_info_type', '资源类型', NULL, NULL, 0, '', '2022-09-06 22:53:40.867000');
 INSERT INTO `core_dict` VALUES (193, '3', 'PDF', 'resources_info_type', '资源类型', NULL, NULL, 0, '', '2022-09-06 22:53:45.915000');

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

@@ -342,8 +342,8 @@ public class StatisticalAnalysisService {
         //上线课程数
 //        Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime, uniOrgId);
 
-        List<CourseInfo> allCourseInfoList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getAllCourseInfoList();
-        data.put("courseNumber", CollUtil.count(allCourseInfoList, null));
+        List<CourseInfo> theoryCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getTheoryCourseList();
+        data.put("courseNumber", CollUtil.count(theoryCourseList, null));
 
         Long resourcesApplicationCount = 0L;
 
@@ -384,6 +384,9 @@ public class StatisticalAnalysisService {
         //课件学习
         TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
         tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ","));
+        if (orgId != 1) {
+            tasksQuery.setOrgId(orgId);
+        }
         List<TeacherOpenCourseHandsOnSimulationTasks> teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery);
         long count = teacherOpenCourseHandsOnSimulationTasks.stream().filter(v -> "1".equals(v.getTaskType()) || "2".equals(v.getTaskType())).count();
         data.put("studyNumber", count);

web/src/main/java/com/ibeetl/jlw/web/query/CourseInfoQuery.java

@@ -6,6 +6,8 @@ import com.ibeetl.jlw.entity.CourseInfo;
 
 import java.util.Date;
 
+import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
+
 /**
  *CourseInfo查询
  */
@@ -18,7 +20,7 @@ public class CourseInfoQuery extends PageParam {
     private String courseInfoName;
     @Query(name = "课程缩略图", display = false)
     private String courseInfoThumbnail;
-    @Query(name = "课程标签", display = true)
+    @Query(name = "课程标签", display = true, type = TYPE_DICT, dict = "course_label.course_label_name.course_label_status=1,${seeMyAndAdminByRole}")
     private Long courseLabelId;
     @Query(name = "课程学习人数基数", display = false)
     private Integer courseInfoBasicsCount;

web/src/main/resources/sql/jlw/universitiesColleges.md

@@ -12,12 +12,14 @@ queryByCondition
         universities_colleges_id,
         CASE WHEN SUM(CASE WHEN use_type = 1 THEN 1 ELSE 0 END) = SUM(CASE WHEN use_type > 0 THEN 1 ELSE 0 END) THEN 1 ELSE CASE WHEN SUM(CASE WHEN use_type = 2 THEN 1 ELSE 0 END) = SUM(CASE WHEN use_type > 0 THEN 1 ELSE 0 END) THEN 2 ELSE 12 END END use_type,
         SUBSTRING_INDEX(GROUP_CONCAT(DISTINCT use_start_time ORDER BY use_start_time),',',1) use_start_time,
-        SUBSTRING_INDEX(GROUP_CONCAT(DISTINCT use_end_time ORDER BY use_end_time DESC),',',1) use_end_time,
-        SUBSTRING_INDEX(GROUP_CONCAT(DISTINCT add_time ORDER BY add_time DESC),',',1) add_time
+        SUBSTRING_INDEX(GROUP_CONCAT(DISTINCT use_end_time ORDER BY use_end_time DESC),',',1) use_end_time
+        @// ,SUBSTRING_INDEX(GROUP_CONCAT(DISTINCT add_time ORDER BY add_time DESC),',',1) add_time
         FROM (
-            SELECT use_start_time,use_end_time,use_type,universities_colleges_id,add_time FROM universities_colleges_jurisdiction_experimental_system WHERE use_type != 0
+            SELECT use_start_time,use_end_time,use_type,universities_colleges_id   @//,add_time 
+            FROM universities_colleges_jurisdiction_experimental_system WHERE use_type != 0
             UNION ALL
-            SELECT use_start_time,use_end_time,use_type,universities_colleges_id,add_time FROM universities_colleges_jurisdiction_curriculum_resources WHERE use_type != 0
+            SELECT use_start_time,use_end_time,use_type,universities_colleges_id   @//,add_time 
+            FROM universities_colleges_jurisdiction_curriculum_resources WHERE use_type != 0
         )t
         GROUP BY universities_colleges_id
     )a ON a.universities_colleges_id = t.universities_colleges_id
@@ -73,7 +75,7 @@ queryByCondition
         and find_in_set(IFNULL(a.use_type,0),#useTypes#)
       @}
   @pageIgnoreTag(){
-  ORDER BY a.add_time DESC
+  ORDER BY t.add_time DESC
   @}