一些bug修复

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

@@ -87,6 +87,16 @@ public class CacheConfig extends CachingConfigurerSupport {
 		return create(redisTemplate, 3600L);
 	}
 
+	/**
+	 * 过期时间5秒
+	 * @param redisTemplate
+	 * @return
+	 */
+	@Bean
+	public RedisCacheManager cacheManager5Second(RedisTemplate redisTemplate) {
+		return create(redisTemplate, 5L);
+	}
+
 	private RedisCacheManager create(RedisTemplate redisTemplate, Long ttl) {
 		RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(redisTemplate.getConnectionFactory());
 		SerializationPair pair = SerializationPair

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java

@@ -31,7 +31,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
 
     //根据表名、字段名查询 主键名和注释 和 字段名和注释
 
-    @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames")
+    @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames", cacheManager = "cacheManager5Second")
     List<Map<String,Object>> findPkAndValue (String tableName, String columnNames);
 
     //根据表名、字段名查询 注释
@@ -40,7 +40,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
 
     //动态表名、字段名查询并包装成coreDict实体
 
-    @Cacheable(value = DICT_CACHE_FIND_ALL_LIST_BY_TABLE, key = "#idName + #filedName + #tableCode + #tableName + #params")
+    @Cacheable(value = DICT_CACHE_FIND_ALL_LIST_BY_TABLE, key = "#idName + #filedName + #tableCode + #tableName + #params", cacheManager = "cacheManager5Second")
     List<CoreDict> findALlListByTable (String idName,String filedName,String tableCode,String tableName,String[] params);
 
     /**

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

@@ -125,9 +125,12 @@ public class UniversityFacultyController extends BaseController {
         ModelAndView view = new ModelAndView("/jlw/universityFaculty/add.html");
         if(null != universityFacultyId){
             UniversityFaculty universityFaculty = universityFacultyService.queryById(universityFacultyId);
+            UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(universityFaculty.getOrgId());
+            view.addObject("universitiesCollegesInfo", universitiesColleges);
             view.addObject("universityFaculty", universityFaculty);
         }else {
             view.addObject("universityFaculty", new UniversityFaculty());
+            view.addObject("universitiesCollegesInfo", new UniversitiesColleges());
         }
         // 如果是学校管理员则查询所在院校的信息
         if (coreUser.isUniAdmin()) {

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

@@ -46,6 +46,9 @@ public class ResourcesInfoQuery extends PageParam {
      * 全路径查询，用于查询归属课程
      */
     private String courseInfoFullId;
+    private String courseInfoId_1;
+    private String courseInfoId_2;
+    private String courseInfoId_3;
 
     public Long getResourcesInfoId(){
         return  resourcesInfoId;
@@ -169,4 +172,28 @@ public class ResourcesInfoQuery extends PageParam {
     public void setCourseInfoFullId(String courseInfoFullId) {
         this.courseInfoFullId = courseInfoFullId;
     }
+
+    public String getCourseInfoId_1() {
+        return courseInfoId_1;
+    }
+
+    public void setCourseInfoId_1(String courseInfoId_1) {
+        this.courseInfoId_1 = courseInfoId_1;
+    }
+
+    public String getCourseInfoId_2() {
+        return courseInfoId_2;
+    }
+
+    public void setCourseInfoId_2(String courseInfoId_2) {
+        this.courseInfoId_2 = courseInfoId_2;
+    }
+
+    public String getCourseInfoId_3() {
+        return courseInfoId_3;
+    }
+
+    public void setCourseInfoId_3(String courseInfoId_3) {
+        this.courseInfoId_3 = courseInfoId_3;
+    }
 }

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

@@ -51,7 +51,13 @@ queryByCondition
       @if(!isEmpty(seeSelf) && seeSelf && !isEmpty(userId)){
         and (t.add_type = 'ADMIN_ADD' or t.user_id = #userId#)
       @}
-  
+      @if(!isEmpty(courseInfoId_1)){
+      and a.course_info_full_id like #courseInfoId_1 + '%'#
+      @} else if(!isEmpty(courseInfoId_2)){
+      and a.course_info_full_id like #courseInfoId_1 + '_' + courseInfoId_2 + '%'#
+      @} else if(!isEmpty(courseInfoId_3)){
+      and a.course_info_full_id like #courseInfoId_1 + '_' + courseInfoId_2 + '_' + courseInfoId_3 + '%'#
+      @}
   ORDER BY t.resources_info_id DESC
     
 

web/src/main/resources/templates/jlw/generalQuestionSetting/add.html

@@ -113,7 +113,7 @@
             <label class="layui-form-label">课程名称</label>
             <div class="layui-input-inline">
                 <layui:simpleDictSelect style='layui-input-inline'
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseInfoIds" name="courseInfoId_0"
                                         layFilter="select_courseInfoIds"/>
             </div>

web/src/main/resources/templates/jlw/handsOn/add.html

@@ -46,7 +46,7 @@
             <label class="layui-form-label"><span class="req">*</span>归属课程：</label>
             <div class="layui-input-block">
                 <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}"
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseInfoIds" name="courseInfoId" layFilter="select_courseInfoIds"/>
             </div>
         </div>

web/src/main/resources/templates/jlw/handsOn/index.html

@@ -13,7 +13,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoId" name="courseInfoId"
                                     layFilter="select_courseInfoIds"/>
         </div>

web/src/main/resources/templates/jlw/handsOn/index1.html

@@ -4,7 +4,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoIds" name="courseInfoId_0"
                                     layFilter="select_courseInfoIds"/>
         </div>

web/src/main/resources/templates/jlw/resourcesCompetition/add.html

@@ -39,7 +39,7 @@
             <label class="layui-form-label">归属课程：</label>
             <div class="layui-input-block">
                 <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}"
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
             </div>
         </div>

web/src/main/resources/templates/jlw/resourcesCompetition/index.html

@@ -13,7 +13,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoIds" name="courseInfoId_0"
                                     layFilter="select_courseInfoIds"/>
         </div>

web/src/main/resources/templates/jlw/resourcesInfo/add.html

@@ -7,7 +7,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">归属课程：</label>
             <div class="layui-input-block">
-                <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_type='应用课程类' and course_label_status = 1))"
+                <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
             </div>
         </div>

web/src/main/resources/templates/jlw/resourcesInfo/index.html

@@ -41,7 +41,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoId" name="courseInfoId_1"
                                     layFilter="select_courseInfoIds_"/>
         </div>
@@ -82,7 +82,7 @@
             <label class="layui-form-label">归属课程：</label>
             <div class="layui-input-block">
                 <layui:simpleDictSelect style='layui-input-inline'
-                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                        type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseId" name="courseId" layFilter="select_courseId"/>
             </div>
         </div>

web/src/main/resources/templates/jlw/resourcesQuestion/add.html

@@ -8,7 +8,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label">归属课程：</label>
                 <div class="layui-input-inline" style="margin-left: 30px;">
-                    <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                    <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                             id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
                 </div>
             </div>

web/src/main/resources/templates/jlw/resourcesQuestion/index.html

@@ -19,7 +19,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoIds" name="courseInfoId_0"
                                     layFilter="select_courseInfoIds"/>
         </div>
@@ -63,7 +63,7 @@
                         <label class="layui-form-label">课程：</label>
                         <div class="layui-input-inline">
                             <layui:simpleDictSelect style='layui-input-inline'
-                                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                                     id="courseInfoIds1" name="courseInfoIds_1"
                                                     layFilter="select_courseInfoIds"/>
                         </div>
@@ -91,7 +91,7 @@
                         <label class="layui-form-label">课程：</label>
                         <div class="layui-input-inline">
                             <layui:simpleDictSelect style='layui-input-inline'
-                                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                                     id="courseInfoIds" name="courseInfoIds_2"
                                                     layFilter="select_courseInfoIds_"/>
                         </div>

web/src/main/resources/templates/jlw/resourcesTraining/add.html

@@ -38,7 +38,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">归属课程：</label>
             <div class="layui-input-block">
-                <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                <layui:simpleDictSelect style='layui-input-inline' value="${courseInfoId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                         id="courseInfoIds" name="courseInfoId_0" layFilter="select_courseInfoIds"/>
             </div>
         </div>

web/src/main/resources/templates/jlw/resourcesTraining/index.html

@@ -13,7 +13,7 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoIds" name="courseInfoId_0"
                                     layFilter="select_courseInfoIds"/>
         </div>

web/src/main/resources/templates/jlw/teacherOpenCourseKnowledgePoint/add.html

@@ -7,7 +7,7 @@
             	<label class="layui-form-label">知识点归属课程</label>
 				<div class="layui-input-inline">
 <!--					<input type="text" id="teacherOpenCourseId" name="teacherOpenCourseId"  value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}"   class="layui-input" >-->
-                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseKnowledgePoint.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                             id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
 				</div>
             </div>

web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html

@@ -90,7 +90,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label">知识点归属课程</label>
                 <div class="layui-input-inline">
-                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreDashboard.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreDashboard.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                             id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
                 </div>
             </div>

web/src/main/resources/templates/jlw/teacherOpenCourseScoreWeight/add.html

@@ -264,7 +264,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label">知识点归属课程</label>
                 <div class="layui-input-inline">
-                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreWeight.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
+                    <layui:simpleDictSelect style='layui-input-inline' value="${teacherOpenCourseScoreWeight.teacherOpenCourseId}" type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                             id="teacherOpenCourseId" name="teacherOpenCourseId" layFilter="select_courseInfoIds"/>
                 </div>
             </div>

web/src/main/resources/templates/jlw/universityFaculty/add.html

@@ -8,9 +8,9 @@
         <div class="layui-inline">
             <label class="layui-form-label">院校名称</label>
             <div class="layui-input-inline">
-                <input type="text" value="${universitiesCollegesInfo.universitiesCollegesName}"
+                <input type="text" value="${universitiesCollegesInfo.universitiesCollegesName!''}"
-                       class="layui-input" data-value="${universitiesCollegesInfo.universitiesCollegesId}" disabled="disabled" style="background-color: #e7e7e7">
+                       class="layui-input" data-value="${universitiesCollegesInfo.universitiesCollegesId!''}" disabled="disabled" style="background-color: #e7e7e7">
-                <input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesInfo.universitiesCollegesId}"
+                <input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesInfo.universitiesCollegesId!''}"
                        class="layui-input">
             </div>
         </div>
@@ -20,7 +20,7 @@
             <label class="layui-form-label">院系名称</label>
             <div class="layui-input-inline">
                 <input type="text" id="universityFacultyName" name="universityFacultyName"
-                       value="${universityFaculty.universityFacultyName}" class="layui-input">
+                       value="${universityFaculty.universityFacultyName!''}" class="layui-input">
             </div>
         </div>
     </div>
@@ -29,7 +29,7 @@
             <label class="layui-form-label">联系人</label>
             <div class="layui-input-inline">
                 <input type="text" id="universityFacultyContact" name="universityFacultyContact"
-                       value="${universityFaculty.universityFacultyContact}" class="layui-input">
+                       value="${universityFaculty.universityFacultyContact!''}" class="layui-input">
             </div>
         </div>
     </div>
@@ -38,7 +38,7 @@
             <label class="layui-form-label">联系人电话</label>
             <div class="layui-input-inline">
                 <input type="text" id="universityFacultyContactTel" name="universityFacultyContactTel"
-                       value="${universityFaculty.universityFacultyContactTel}" class="layui-input">
+                       value="${universityFaculty.universityFacultyContactTel!''}" class="layui-input">
             </div>
         </div>
     </div>
@@ -48,12 +48,12 @@
             <div class="layui-input-inline">
                 <textarea id="universityFacultyContactAddress" name="universityFacultyContactAddress"
                           placeholder="请输入地址"
-                          class="layui-textarea">${universityFaculty.universityFacultyContactAddress}</textarea>
+                          class="layui-textarea">${universityFaculty.universityFacultyContactAddress!''}</textarea>
             </div>
         </div>
     </div>
     <!-- 业务对象须有hidden字段，保存delFlag和version字段-->
-    <input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId}"/>
+    <input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId!''}"/>
 
 </form>
 <!--#} -->

web/src/main/resources/templates/jlw/universityFaculty/index.html

@@ -6,7 +6,7 @@
 </style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">
     <input type="hidden" name="universityFacultyStatus" value="1" />
-    <input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesInfo.universitiesCollegesId}">
+    <input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesInfo.universitiesCollegesId!''}">
 </layui:searchForm>
 <div class="layui-btn-group">
     <layui:accessButton function="universityFaculty.add" action="add"><i class="layui-icon">&#xe61f;</i>新增