Merge branch 'dev_1_2_20220802'

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

@@ -64,6 +64,17 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "是否置顶(0:否;1:是)")
     private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
 
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
     public YesOrNoEnum getTopFlag() {
         return topFlag;
     }

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

@@ -26,8 +26,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     private ClientEnum userType;
 
 
-    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
-    private YesOrNoEnum auditVersion;
 
     @ApiModelProperty(value = "版本号")
     private String version;
@@ -46,15 +44,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     }
 
 
-
-    public YesOrNoEnum getAuditVersion() {
-        return auditVersion;
-    }
-
-    public void setAuditVersion(YesOrNoEnum auditVersion) {
-        this.auditVersion = auditVersion;
-    }
-
     public String getVersion() {
         return version;
     }

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

@@ -79,6 +79,9 @@
         <where>
             su.del_flag_ = 0
             <include refid="QueryInfo"/>
+            <if test="param.auditVersion != null ">
+                and #{param.auditVersion} = t.audit_version_
+            </if>
         </where>
         order by
         <if test="param.myself == null or param.myself == false ">