Merge branch 'zx_online_scoretype' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -1,9 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
-import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
 import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
@@ -30,8 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
@@ -44,8 +39,6 @@ public class MusicSheetController extends BaseController {
 	private MusicSheetService musicSheetService;
 	@Resource
 	private CbsMusicScoreService cbsMusicScoreService;
-	@Resource
-	private MusicFeignClientService musicFeignClientService;
 
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")

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

@@ -131,6 +131,9 @@
             <if test="param.delFlag != null">
                 and t.del_flag_ = #{param.delFlag}
             </if>
+            <if test="param.enable != null">
+                and t.state_ = #{param.enable}
+            </if>
         </where>
     </select>
     <select id="categoryList"