Merge branch 'feature/0721-tenant' of E:\cooleshow\code with conflicts.

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

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.admin.io.request.TenantAlbumVo;
 import com.yonge.cooleshow.api.feign.dto.TenantWrapper;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
@@ -16,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -65,7 +65,8 @@ public class TenantAlbumController {
     //@PreAuthorize("@pcs.hasPermissions('tenantAlbum/page')")
     public HttpResponseResult<PageInfo<TenantAlbumWrapper.TenantAlbum>> page(@RequestBody TenantAlbumWrapper.TenantAlbumQuery query) {
 
-        IPage<TenantAlbumWrapper.TenantAlbum> pages = tenantAlbumService.selectPage(QueryInfo.getPage(query), query);
+
+        IPage<TenantAlbumWrapper.TenantAlbum> pages = tenantAlbumService.selectPage(query.getPage(query), query);
         return HttpResponseResult.succeed(PageUtil.pageInfo(pages));
     }
 

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

@@ -39,7 +39,7 @@ public class TenantInfoController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "TenantInfo")
-    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/page')")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/page')")
     public HttpResponseResult<PageInfo<TenantInfoWrapper.TenantInfo>> page(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
 
         IPage<TenantInfoWrapper.TenantInfo> pages = tenantInfoService.selectPage(PageUtil.getPage(query), query);

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

@@ -1,10 +1,9 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -32,7 +31,7 @@ public class TenantAlbumWrapper {
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel(" TenantAlbumQuery-机构专辑")
-    public static class TenantAlbumQuery implements QueryInfo {
+    public static class   TenantAlbumQuery implements QueryInfo {
 
         @ApiModelProperty("主键ID")
         private Long id;
@@ -75,41 +74,41 @@ public class TenantAlbumWrapper {
     @ApiModel(" TenantAlbum-机构专辑返回")
     public static class TenantAlbum {
 
-        @ApiModelProperty("主键ID")
-        private Long id;
+            @ApiModelProperty("主键ID")
+            private Long id;
 
-        @ApiModelProperty("机构ID")
-        private Long tenantId;
+            @ApiModelProperty("机构ID")
+            private Long tenantId;
 
-        @ApiModelProperty("专辑名称")
-        private String name;
+            @ApiModelProperty("专辑名称")
+            private String name;
 
-        @ApiModelProperty("机构名称")
-        private String tenantName;
+            @ApiModelProperty("机构名称")
+            private String tenantName;
 
-        @ApiModelProperty("专辑介绍")
-        private String describe;
+            @ApiModelProperty("专辑介绍")
+            private String describe;
 
-        @ApiModelProperty("专辑封面")
-        private String coverImg;
+            @ApiModelProperty("专辑封面")
+            private String coverImg;
 
-        @ApiModelProperty("曲目数")
-        private Integer musicNum;
+            @ApiModelProperty("曲目数")
+            private Integer musicNum;
 
-        @ApiModelProperty("平台价格")
-        private BigDecimal originalPrice;
+            @ApiModelProperty("平台价格")
+            private BigDecimal originalPrice;
 
-        @ApiModelProperty("机构价格")
-        private BigDecimal salePrice;
+            @ApiModelProperty("机构价格")
+            private BigDecimal salePrice;
 
-        @ApiModelProperty("购买周期")
-        private Integer purchaseCycle;
+            @ApiModelProperty("购买周期")
+            private Integer purchaseCycle;
 
-        @ApiModelProperty("曲目声部分类(多个,分隔)")
-        private String subjectTypes;
+            @ApiModelProperty("曲目声部分类(多个,分隔)")
+            private String subjectTypes;
 
-        @ApiModelProperty("启用状态")
-        private Boolean status;
+            @ApiModelProperty("启用状态")
+            private Boolean status;
 
         @ApiModelProperty("删除标识")
         private Boolean delFlag;
@@ -132,7 +131,7 @@ public class TenantAlbumWrapper {
         }
 
         @Data
-        public static class MusicSheetData {
+        public static class MusicSheetData{
             private SubjectTypeEnum subjectType;
 
             private List<Long> musicSheetIdList = new ArrayList<>();
@@ -184,10 +183,10 @@ public class TenantAlbumWrapper {
         @ApiModelProperty("采购倍数")
         private Integer buyMultiple;
 
-        @ApiModelProperty(value = "采购周期", hidden = true)
+        @ApiModelProperty(value = "采购周期",hidden = true)
         private Integer buyCycle;
 
-        @ApiModelProperty(value = "采购机构", hidden = true)
+        @ApiModelProperty(value = "采购机构",hidden = true)
         private Long tenantId;
 
     }