hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 04:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0704-llf' into dev0525

Browse Source
This commit is contained in:
zhaolongfei
2024-07-04 14:23:05 +08:00
parent 7e2b3506c6 559f525450
commit c9dbc8a622
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
View File

@@ -238,7 +238,6 @@ public class CourseFileApi extends ApiBaseController {
file.setDeleted(false); file.setDeleted(false);
file.setDown(true);//默认允许下载 file.setDown(true);//默认允许下载
file.setDuration(0);
if (file.getResType() == null) { if (file.getResType() == null) {
if ("mp4".indexOf(file.getFileType()) > -1) { if ("mp4".indexOf(file.getFileType()) > -1) {
file.setResType(10);//以后换成变量 file.setResType(10);//以后换成变量

5
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
View File

@@ -57,9 +57,10 @@ public class CourseContentServiceImpl implements ICourseContentService {
if(StringUtils.isBlank(cc.getId())) { if(StringUtils.isBlank(cc.getId())) {
//新增的情况 //新增的情况
cc.setDeleted(false); cc.setDeleted(false);
if(cc.getDuration()==null) { if(exam.getTestDuration()==null) {
cc.setDuration(0); exam.setTestDuration(0);
} }
cc.setDuration(exam.getTestDuration());
//如果是没有目录的，并具是课程内容 //如果是没有目录的，并具是课程内容
if(dto.getType()!=null && dto.getType()==10) { if(dto.getType()!=null && dto.getType()==10) {
if(cc.getSortIndex()==1) { if(cc.getSortIndex()==1) {