Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -327,7 +327,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
 
     void batchUpdateFsUserWatchLog(@Param("list") List<FsCourseWatchLog> logs);
 
-    @Select("select * from fs_course_watch_log where user_id = #{userId} and video_id = #{videoId} and send_type = 1")
+    @Select("select * from fs_course_watch_log where user_id = #{userId} and video_id = #{videoId} and send_type = 1 order by log_id desc limit 1")
     FsCourseWatchLog getCourseWatchLogByUser(@Param("userId") Long userId, @Param("videoId") Long videoId);
 
     @Select("WITH date_series AS (\n" +

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1451,7 +1451,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         //读取配置给前端返回
         String json = sysConfigService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (org.apache.commons.lang3.StringUtils.isEmpty(user.getNickname()) || org.apache.commons.lang3.StringUtils.isEmpty(user.getAvatar())){
+        if (user.getNickname()!=null){
             Map<String,Object> map = new HashMap<>();
             map.put("authType",config.getMiniAppAuthType());
             if (config.getMiniAppAuthType()==2){

fs-service-system/src/main/java/com/fs/store/param/FsUserEditParam.java

@@ -3,13 +3,14 @@ package com.fs.store.param;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
 public class FsUserEditParam implements Serializable
 {
 
-    @NotBlank(message = "用户昵称不能为空！")
+    @NotNull(message = "用户昵称不能为空！")
     private String nickname;
 
 //    @NotBlank(message = "用户头像不能为空！")

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -543,7 +543,7 @@
         LEFT JOIN company_tag_user ON fs_user.user_id = company_tag_user.user_id
         LEFT JOIN company_tag ON FIND_IN_SET(company_tag.tag_id, company_tag_user.tag_ids) > 0
         LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
-        LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
+        LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         where fs_user.is_del = 0
         <if test="userId != null and userId!= 0 ">
             and fs_user.company_user_id = #{userId}

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -154,6 +154,7 @@ public class WxCompanyUserController extends AppBaseController {
                         user.setCompanyId(param.getCompanyId());
                         user.setCompanyUserId(param.getCompanyUserId());
                     }
+//                    redisCache.setCacheObject("");
                     userService.insertFsUser(user);
                 }
             } else {