From 84234d0707314a58cf1befb640e2d408ebb861c1 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期二, 15 四月 2025 17:10:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java | 2 +-
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java | 5 +----
easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue | 4 ++--
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java | 5 ++++-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue b/easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue
index 03e46c0..d3a1916 100644
--- a/easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue
+++ b/easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue
@@ -16,7 +16,7 @@
<el-form-item :label="t('digitalhumans.picture')" v-if="formData.useModel == 1" prop="pictureUrl">
<UploadImg disabled v-model="formData.pictureUrl" />
</el-form-item>
- <el-form-item v-if="formData.useModel == 2 || formData.useModel == 3" :label="t('digitalhumans.video')" prop="videoUrl">
+ <el-form-item v-if="(formData.useModel == 2 || formData.useModel == 3) && !(formData.videoUrl || formData.fixVideoUrl) " :label="t('digitalhumans.video')" prop="videoUrl">
<UploadFile v-if="!(formData.videoUrl || formData.fixVideoUrl)" v-model="formData.videoUrl" :fileType="['mp4']" :limit="1" @on-success="handleFileSuccess('fixVideoUrl', $event)"/>
@@ -76,7 +76,7 @@
<!-- 涓嬮潰鐨勬槸鍘熸湰鐨� -->
<!-- <video-player v-if="formData.fixVideoUrl" :property="videoProperty"/> -->
<!-- 涓嬮潰鐨勬槸閽堝mov鏂板姞鐨� -->
- <VideoPlayerMov v-if="formData.fixVideoUrl" :property="videoProperty"/>
+ <!-- <VideoPlayerMov v-if="formData.fixVideoUrl" :property="videoProperty"/> -->
</el-form-item>
<el-form-item v-if="formData.status == 0" :label="t('digitalhumans.expireDate')">
<el-date-picker
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java
index 5ce1222..f218198 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java
@@ -21,7 +21,6 @@
private String code;
@Schema(description = "璇曞惉URL", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "璇曞惉URL涓嶈兘涓虹┖")
private String auditionUrl;
@Schema(description = "澶村儚URL", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -29,7 +28,6 @@
private String avatarUrl;
@Schema(description = "璇█绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "璇█绫诲瀷涓嶈兘涓虹┖")
private String language;
@Schema(description = "鎬у埆")
@@ -42,7 +40,6 @@
private Integer quality;
@Schema(description = "澹伴煶绫诲瀷 ", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "澹伴煶绫诲瀷 涓嶈兘涓虹┖")
private Integer voiceType;
@Schema(description = "鐘舵�� (0: 姝ｅ父, 1: 寰呭鏍革紝2锛氬凡鍙楃悊锛�3锛氳缁冧腑锛�4锛氫笉閫氳繃锛�5锛氳缁冨け璐�)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@@ -54,4 +51,4 @@
@Schema(description = "鍏嬮殕绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer type;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java
index 4158dd5..c1a8d64 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
import cn.iocoder.yudao.module.digitalcourse.controller.admin.coursemedia.vo.CourseMediaPageReqVO;
import cn.iocoder.yudao.module.digitalcourse.dal.dataobject.coursemedia.CourseMediaDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,6 +22,7 @@
public interface CourseMediaMapper extends BaseMapperX<CourseMediaDO> {
default PageResult<CourseMediaDO> selectPage(CourseMediaPageReqVO reqVO) {
+ Long loginUserId = WebFrameworkUtils.getLoginUserId();
return selectPage(reqVO, new LambdaQueryWrapperX<CourseMediaDO>()
.eqIfPresent(CourseMediaDO::getStatus, reqVO.getStatus())
.betweenIfPresent(CourseMediaDO::getCreateTime, reqVO.getCreateTime())
@@ -33,6 +35,7 @@
.eqIfPresent(CourseMediaDO::getCourseId, reqVO.getCourseId())
.likeIfPresent(CourseMediaDO::getCourseName, reqVO.getCourseName())
.eqIfPresent(CourseMediaDO::getCreator, reqVO.getCreator())
+ .apply(loginUserId != 1, "creator = {0}", loginUserId)
.orderByDesc(CourseMediaDO::getId));
}
@@ -42,4 +45,4 @@
List<CourseMediaDO> selectByIdAndStatusList(@Param("id") Long id,@Param("status") List<Integer> status);
Integer lockPoint(@Param("userId") Long userId, @Param("status") List<Integer> status);
-}
\ No newline at end of file
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java
index f460724..6b2cd38 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java
@@ -84,7 +84,7 @@
public PageResult<CourseMediaDO> getCourseMediaPage(CourseMediaPageReqVO pageReqVO) {
PageResult<CourseMediaDO> courseMediaDOPageResult = courseMediaMapper.selectPage(pageReqVO);
for (CourseMediaDO courseMediaDO : courseMediaDOPageResult.getList()) {
- if (courseMediaDO.getStatus() == 1) {
+ if (courseMediaDO.getStatus() == 1 || courseMediaDO.getStatus() == 0) {
//瑙嗛鍚堟垚涓� 鏌ヨ鎺掗槦鍜屽悎鎴愯繘搴�
Long id = courseMediaDO.getCourseId();
int pos = mediaTaskManager.getQueuePosition(id);
--
Gitblit v1.9.3