czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-01-03 15:52:06 +08:00
parent 108267818d 020fb85a08
commit 417d25795a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sqx/modules/app/entity/UserInfo.java
View File

@ -1,22 +1,20 @@
package com.sqx.modules.app.entity; package com.sqx.modules.app.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
/** /**
* *
* @TableName user_info * @TableName user_info
*/ */
@TableName(value ="user_info") @TableName(value ="user_info")
@Data @Data
public class UserInfo implements Serializable { public class UserInfo implements Serializable {
/** /**
* *
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private Long id; private Long id;
@ -24,6 +22,7 @@ public class UserInfo implements Serializable {
/** /**
* 用户id * 用户id
*/ */
@TableField(updateStrategy = FieldStrategy.NEVER)
private Long userId; private Long userId;
/** /**
@ -90,4 +89,4 @@ public class UserInfo implements Serializable {
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
} }

2
src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
View File

@ -225,7 +225,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
.orderByDesc(CourseCollect::getUpdateTime).last("limit 1") .orderByDesc(CourseCollect::getUpdateTime).last("limit 1")
); );
if (courseCollect != null && courseCollect.getCourseDetailsId() != null) { if (courseCollect != null && courseCollect.getCourseDetailsId() != null) {
CourseDetails courseDetails = courseDetailsDao.selectOne(new LambdaQueryWrapper<CourseDetails>().eq(CourseDetails::getCourseId, courseCollect.getCourseId()) CourseDetails courseDetails = courseDetailsDao.selectOne(new LambdaQueryWrapper<CourseDetails>().eq(CourseDetails::getCourseId, id)
.eq(CourseDetails::getCourseDetailsId, courseCollect.getCourseDetailsId())); .eq(CourseDetails::getCourseDetailsId, courseCollect.getCourseDetailsId()));
if (courseDetails != null) { if (courseDetails != null) {
bean.setCourseDetailsId(courseDetails.getCourseDetailsId()); bean.setCourseDetailsId(courseDetails.getCourseDetailsId());