1.机构专辑搜索条件调整

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumWrapper.java

@@ -50,9 +50,6 @@ public class TenantAlbumWrapper {
         @ApiModelProperty("机构ID")
         private Long tenantId;
 
-        @ApiModelProperty("专辑名称")
-        private String name;
-
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }

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

@@ -30,8 +30,10 @@
         LEFT JOIN tenant_album_ref r on t.id_ = r.tenant_album_id_
         left join tenant_info i on r.tenant_id_ = i.id_
         <where>
-            <if test="param.name != null and param.name != ''">
-                and t.name_ like CONCAT('%', #{param.name}, '%')
+            <if test="param.keyword !=null and param.keyword.trim() !=''">
+                and (t.name_ like concat('%',#{param.keyword},'%')
+                or i.name_ like concat('%',#{param.keyword},'%')
+                )
             </if>
             <if test="param.tenantId != null ">
                 and i.id_= #{param.tenantId}