1.bug修复

2.课程，人员等相关接口应需返额外字段，加入新检索

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseInfoMapper.xml

@@ -236,7 +236,8 @@
             IFNULL(ci.END_TIME,'') as endTime,
             IFNULL(ci.SEMESTER_ID ,'') as semesterId,
             IFNULL(s.NAME ,'') as semesterIdName,
-            IFNULL(ci.VIEW_COUNT ,'') as viewCount
+            IFNULL(ci.VIEW_COUNT ,'') as viewCount,
+            IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
         LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseNotesMapper.xml

@@ -35,7 +35,7 @@
             IFNULL(cn.COURSE_ID,'') AS courseId,
             IFNULL(ci.COURSE_NAME,'') AS courseName,
             IFNULL(cn.USER_ID,'') AS userId,
-            IFNULL(cn.NOTE_CONTENT,'') AS noteContent,
+            IFNULL(CAST(cn.NOTE_CONTENT AS VARCHAR),'') AS noteContent,
             IFNULL(cr.MAIN_ID ,'') AS hourId,
             IFNULL(cc.NAME,'') AS hourIdName
         FROM COURSE_NOTES cn
@@ -54,4 +54,20 @@
         </if>
         order by cn.CREATE_TIME desc
     </select>
+    <select id="queryInfo" resultType="java.util.Map">
+        SELECT
+            cn.NOTE_ID AS noteId,
+            IFNULL(cn.COURSE_ID,'') AS courseId,
+            IFNULL(ci.COURSE_NAME,'') AS courseName,
+            IFNULL(cn.USER_ID,'') AS userId,
+            IFNULL(CAST(cn.NOTE_CONTENT AS VARCHAR),'') AS noteContent,
+            IFNULL(cr.MAIN_ID ,'') AS hourId,
+            IFNULL(cc.NAME,'') AS hourIdName
+        FROM COURSE_NOTES cn
+        LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = cn.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN COURSE_RELATE cr ON cr.RELATE_ID =cn.NOTE_ID AND cr.FUNC_TYPE ='6' AND cr.INFO_TYPE ='1' AND cr.CHAPTERHOUR_TYPE ='1'
+        LEFT JOIN COURSE_CLASSHOUR cc ON cc.ID = cr.MAIN_ID AND cc.DELETE_FLAG ='NOT_DELETE'
+        WHERE cn.DELETE_FLAG ='NOT_DELETE'
+          and cn.NOTE_ID=#{noteId}
+    </select>
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseRelateMapper.xml

@@ -21,7 +21,7 @@
                 IFNULL (rf.FILE_URL,'') AS url,
             </if>
             <if test="funcType == 0 || funcType == 2 ||funcType == 3 ">
-                IFNULL (df.NAME,'') AS name,
+                IFNULL (CAST(df.NAME AS VARCHAR),'') AS name,
                 IFNULL (CAST(df.DOWNLOAD_PATH AS VARCHAR),'') AS url,
             </if>
             <if test="funcType == 4 ||funcType == 5 ">

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseStudentCollectMapper.xml

@@ -25,6 +25,8 @@
             IFNULL(ci.PUTAWAY_STATUS,'') as putawayStatus,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_PUTAWAY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(ci.PUTAWAY_STATUS) ),'') AS putawayStatusName,
             IFNULL(ci.PUBLISH_TIME,'') as publishTime,
+            IFNULL(ci.COVER_IMAGE_ID,'') as coverImageId,
+            IFNULL (CAST(df.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath,
             IFNULL(ci.TIME_LIMIT_TYPE,'') as timeLimitType,
             IFNULL(ci.START_TIME,'') as startTime,
             IFNULL(ci.END_TIME,'') as endTime,
@@ -32,6 +34,7 @@
             IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_STUDENT_COLLECT csc
         LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = csc.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE df ON ci.COVER_IMAGE_ID =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co ON ci.COLLEGE_ID=co.ID AND co.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserPageParam.java

@@ -12,6 +12,8 @@
  */
 package vip.xiaonuo.sys.modular.user.param;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -66,4 +68,8 @@ public class SysUserPageParam {
     @ApiModelProperty(value = "姓名")
     private String name;
 
+    /** 学历 */
+    @ApiModelProperty(value = "学历", position = 21)
+    private String education;
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -317,6 +317,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotEmpty(sysUserPageParam.getIsResourceaccount())) {
             queryWrapper.lambda().eq(SysUser::getIsResourceaccount, sysUserPageParam.getIsResourceaccount());
         }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getEducation())) {
+            queryWrapper.lambda().eq(SysUser::getEducation, sysUserPageParam.getEducation());
+        }
 
         queryWrapper.lambda().orderByAsc(SysUser::getSortCode);
         List<SysUser> jsonList =  this.list(queryWrapper);