Merge branch 'dev_v1.3.5_20220928' into dev_v1.3.5_20220927

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

@@ -35,6 +35,9 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     @ApiModelProperty("客户端类型")
     private ClientEnum clientType;
 
+    @ApiModelProperty(value = "艺术家")
+    private String composer;  //音乐家
+
     public Integer getRelatedNum() {
         return relatedNum;
     }
@@ -67,6 +70,14 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
         this.clientType = clientType;
     }
 
+    public String getComposer() {
+        return composer;
+    }
+
+    public void setComposer(String composer) {
+        this.composer = composer;
+    }
+
     @Override
     public Boolean getDelFlag() {
         return delFlag;

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

@@ -163,6 +163,9 @@
         left join album_music_relate amr on t.id_ = amr.music_sheet_id_
         left join sys_user su on t.create_by_ = su.id_
         <where>
+            <if test="param.composer != null">
+                AND t.composer_ LIKE '%${param.composer}%'
+            </if>
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (t.id_ like concat('%',#{param.idAndName},'%') or
                 t.music_sheet_name_ like concat('%',#{param.idAndName},'%'))