Merge branch 'dev_v1.3.7_20221020'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseGroupSearch.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,12 +52,23 @@ public class CourseGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "老师id")
     private Long teacherId;
 
+    @ApiModelProperty("置顶")
+    private YesOrNoEnum topFlag;
+
     @ApiModelProperty(value = "是否上架 （0:否  1：是）")
     private Integer shelvesFlag;
 
     @ApiModelProperty(value = "是否草稿 （0:否  1：是）",hidden = true)
     private Integer draftFlag;
 
+    public YesOrNoEnum getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(YesOrNoEnum topFlag) {
+        this.topFlag = topFlag;
+    }
+
     public Integer getDraftFlag() {
         return draftFlag;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -618,6 +618,9 @@
             <if test="param.draftFlag != null">
                 AND g.draft_flag_ = #{param.draftFlag}
             </if>
+            <if test="param.topFlag != null">
+                AND g.top_flag_ = #{param.topFlag}
+            </if>
         </where>
         order by g.top_flag_ desc ,g.sort_number_ desc,g.id_ desc
     </select>