过滤掉参数为0 的声部id

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

@@ -8,9 +8,11 @@ import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Description 专辑查询
@@ -86,7 +88,13 @@ public class MusicAlbumSearch extends QueryInfo{
     public void setSubjectIds(String subjectIds) {
         this.subjectIds = subjectIds;
         if (StringUtils.isNotBlank(subjectIds)) {
-            this.subjectIdList = StringUtil.toLongList(subjectIds);
+            // 过滤掉声部id为 0的
+            List<Long> list = StringUtil.toLongList(subjectIds);
+            this.subjectIdList = list.stream().filter(l -> !l.equals(0L)).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(this.subjectIdList)) {
+                this.subjectIdList = null;
+                this.subjectIds = null;
+            }
         }
     }
 

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

@@ -11,9 +11,11 @@ import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Description
@@ -188,7 +190,13 @@ public class MusicSheetSearch  extends QueryInfo{
     public void setSubjectIds(String subjectIds) {
         this.subjectIds = subjectIds;
         if (StringUtils.isNotBlank(subjectIds)) {
-            this.subjectIdList = StringUtil.toLongList(subjectIds);
+            // 过滤掉声部id为 0的
+            List<Long> list = StringUtil.toLongList(subjectIds);
+            this.subjectIdList = list.stream().filter(l -> !l.equals(0L)).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(this.subjectIdList)) {
+                this.subjectIdList = null;
+                this.subjectIds = null;
+            }
         }
     }
 

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

@@ -116,7 +116,7 @@
                 find_in_set(#{item},t.music_tag_)
             </foreach>
         </if>
-        <if test="param.subjectIds != null and param.subjectIds != ''">
+        <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
             and
             <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                 find_in_set(#{item},t.music_subject_)
@@ -184,7 +184,7 @@
                     find_in_set(#{item},t.music_tag_)
                 </foreach>
             </if>
-            <if test="param.subjectIds != null and param.subjectIds != ''">
+            <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
                 and
                 <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},t.music_subject_)