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

解决代码冲突导致的问题

Browse Source
This commit is contained in:
lwj
2025-12-18 15:05:31 +08:00
committed by joshen
parent beb4fb7470
commit fb99a5562e
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.parameters.P;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -261,9 +260,9 @@ public class CourseManageApi extends ApiBaseController{
}
}
//补充审核人,审核时间字段
if(CollectionUtils.isEmpty(coursePageList.getList())){
fullAuditInfo(coursePageList.getList());
}
// if(CollectionUtils.isEmpty(coursePageList.getList())){
// fullAuditInfo(coursePageList.getList());
// }
return success(coursePageList);
}catch(Exception e) {
log.error("管理课程列表查询错误",e);

6
servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
View File

@@ -478,12 +478,6 @@ public class Course extends BaseEntity {
@Column(name = "create_from")
private String createFrom;
@Transient
private String auditUser;
@Transient
private LocalDateTime auditTime;
public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
super.setId(id);
this.name=name;

2
servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java
View File

@@ -57,7 +57,7 @@ public interface ICourseHRBPAuditService {
*/
PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList);
//List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList);
/**
* 查询一组课程的最近一次审核记录，返回键为courseId的映射。