Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -43,14 +43,23 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_,is_affix_,is_iframe_,link_path_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive},#{isAffix},#{isIframe},#{linkPath})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu">
         UPDATE sys_menu
         <set>
+            <if test="isAffix != null">
+                is_affix_ = #{isAffix},
+            </if>
+            <if test="isIframe != null">
+                is_iframe_ = #{isIframe},
+            </if>
+            <if test="linkPath != null">
+                link_path_ = #{linkPath},
+            </if>
             <if test="parentId != null">
                 parent_id_ = #{parentId},
             </if>

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

@@ -133,12 +133,17 @@ public class MusicSheetController extends BaseController {
             } else {
                 pageSize = musicSheetDto.getPageSize();
             }
-
+            String search;
+            if(musicSheetDto.getSearch()==null){
+                search = "";
+            } else {
+                search = musicSheetDto.getSearch();
+            }
             LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getComposer , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , musicSheetDto.getSearch());
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getComposer , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , search);
 
             Page<MusicSheet> page = new Page<>(pageNo,pageSize);
             return succeed(musicSheetService.page(page, lambdaQueryWrapper));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -75,7 +75,7 @@ public class MusicSheet extends BaseEntity {
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态")
+    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
     private Integer auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
 
     @TableField("sort_number_")