修改pageUtil的自动获取机构id问题

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponIssueRecordServiceImpl.java

@@ -142,6 +142,7 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
     public PageInfo<CouponIssueRecordVo> queryIssueRecord(Map<String, Object> param) {
         Page<CouponIssueRecordVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("a.created_time_");
+        param.put("tenantId",TenantContextHolder.getTenantId());
         return PageUtil.pageInfo(baseMapper.queryIssueRecord(pageInfo, param));
     }
 
@@ -163,6 +164,7 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
     public PageInfo<?> queryIssueDetail(Map<String, Object> param) {
         Page<?> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("scc.create_time_");
+        param.put("tenantId",TenantContextHolder.getTenantId());
         return PageUtil.pageInfo(baseMapper.queryIssueDetail(pageInfo, param));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantCloudCourseRecordServiceImpl.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
 import com.ym.mec.biz.service.TenantCloudCourseRecordService;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,7 @@ public class TenantCloudCourseRecordServiceImpl extends ServiceImpl<TenantCloudC
 
         Page<TenantCloudCourseRecordVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("a.created_time_");
+        param.put("tenantId", TenantContextHolder.getTenantId());
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, param));
     }
 

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -63,9 +63,6 @@ public class PageUtil {
     public static <O, T> Page<T> getPageInfo(Map<String, O> param) {
         int pageSize = getPage(param, "rows").orElse(20);
         int pageIndex = getPage(param, "page").orElse(1);
-        if (!param.containsKey("tenantId")) {
-            param.put("tenantId", (O) TenantContextHolder.getTenantId());
-        }
         return new Page<>(pageIndex, pageSize);
     }