diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java index c52dc9f2..a14ead87 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java @@ -31,11 +31,16 @@ import static com.ibeetl.admin.core.util.StreamUtils.listJoin; @Table(name = "course_info", assignID = true) public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity { + /** + * 留空不传值 + */ + @AssignID + private Long courseInfoId; + /** * 条件,机构ID 比较通用 */ @NotNull(message = "机构ID不能为空!") - @AssignID private Long orgId; /** @@ -88,7 +93,8 @@ public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity { " AND tb.use_type != 0\n" + " AND tb.use_type IS NOT NULL\n" + " @if(!isEmpty(orgId) && orgId != 1) { \n" + - " \tAND tb.org_id = #orgId# \n" + + // 查询 超管上传的和自己上传的理论课程类的 + " \tAND find_in_set(ifnull(tb.org_id, 1), #'1,' + orgId#) \n" + " @} \n" + " AND ( now() BETWEEN tb.use_start_time AND tb.use_end_time )\n" + " LEFT JOIN course_label td ON td.course_label_id = t.course_label_id\n" + diff --git a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java index 47eb538a..e0923f54 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.GetFile; @@ -326,6 +325,7 @@ public class GeneralQuestionLogController extends BaseController { * @return */ @PostMapping(API + "/scoreDetailInfo.do") + @Deprecated public JsonResult scoreDetailInfo(@Validated GeneralQuestionLogScoreDetailsInfoQuery query, @SCoreUser CoreUser coreUser) { return JsonResult.success(generalQuestionLogService.getQuestionLogScoreDetailsInfo(query.getPageQuery())); }