zyp

fs-service/src/main/java/com/fs/course/mapper/FsUserCompanyBindMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.domain.FsUserCompanyBind;
 import com.fs.course.vo.UserWatchLogListVo;
 import com.fs.qw.param.UserWatchLogParam;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

fs-service/src/main/java/com/fs/course/vo/UserWatchLogListVo.java

@@ -14,6 +14,8 @@ import java.time.LocalDateTime;
 @Data
 public class UserWatchLogListVo {
 
+    private Long id;
+
     private Integer logType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime finishTime;

fs-service/src/main/resources/mapper/course/FsUserCompanyBindMapper.xml

@@ -134,8 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.nick_name fsUserName,
         c.dict_label projectName,
         e.course_name,
---         IF(g.company_user_id = #{userId}, g.qw_user_name, '其他') qwUserName,
-        g.qw_user_name as qwUserName,
+        IF(g.company_user_id = #{userId}, g.qw_user_name, '其他') qwUserName,
+--         g.qw_user_name,
         f.title videoName,
         qc.corp_name
         from