From 288fc89bd62323e8562419090fd351470d843ea1 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 25 Jun 2024 16:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E7=A7=9F=E6=88=B7=EF=BC=9B=E9=97=A8=E6=88=B7=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=BC=98=E5=8C=96=E5=8C=BA=E5=88=86=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/portal/PortalController.java  |  3 ++-
 .../system/mapper/SysCatalogResourceMapper.java     |  2 +-
 .../service/impl/SysCatalogResourceServiceImpl.java |  4 +++-
 .../resources/mapper/system/StatisticMapper.xml     | 13 +++++++------
 .../mapper/system/SysCatalogResourceMapper.xml      |  8 ++++++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java
index 7910897..033a38b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java
@@ -109,7 +109,8 @@ public class PortalController extends BaseController {
     @GetMapping("/resource/catalog/pageList")
     public TableDataInfo<SysCatalogResourceVo> pageList(HttpServletRequest request,SysCatalogResourceBo bo, PageQuery pageQuery) {
         String tenantId = ServletUtils.getHeader(request, "Tenantid");
-        TenantHelper.setDynamic(tenantId);
+        //TenantHelper.setDynamic(tenantId);
+        bo.setAncestors(tenantId);
         return resourceService.queryProtalPageList(bo, pageQuery);
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java
index 4d572ff..8d8d3ad 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java
@@ -17,5 +17,5 @@ import org.dromara.system.domain.vo.SysCatalogResourceVo;
 @Mapper
 public interface SysCatalogResourceMapper extends BaseMapperPlus<SysCatalogResource, SysCatalogResourceVo> {
     Page<SysCatalogResourceVo> selectPageList(@Param("page") Page<SysCatalogResource> page, @Param("catalogId") Long catalogId);
-    Page<SysCatalogResourceVo> selectProtalPageList(@Param("page") Page<SysCatalogResource> page);
+    Page<SysCatalogResourceVo> selectProtalPageList(@Param("page") Page<SysCatalogResource> page,@Param("tenantId") String tenantId);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
index 9cb7270..aca6351 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
@@ -95,7 +95,9 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService
     public TableDataInfo<SysCatalogResourceVo> queryProtalPageList(SysCatalogResourceBo bo, PageQuery pageQuery) {
         //LambdaQueryWrapper<SysCatalogResource> lqw = buildQueryWrapper(bo);
         //为了兼容 vo中的  @Translation(type = TransConstant.OSS_ID_TO_URL)
-        IPage<SysCatalogResourceVo> result = baseMapper.selectProtalPageList(pageQuery.build());
+        //临时存放
+        String tenantId = bo.getAncestors();
+        IPage<SysCatalogResourceVo> result = baseMapper.selectProtalPageList(pageQuery.build(), tenantId);
         return TableDataInfo.build(result);
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml
index 33faceb..23fc32c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml
@@ -4,19 +4,20 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.StatisticMapper">
     <select id="selectGradeNum" resultType="int">
-        select count(*)
-        from sys_dept
-        where  parent_id = 100
+        select count(d.dept_id)
+        from sys_dept d left join sys_dept p on p.dept_id = d.parent_id
+        where  p.parent_id = 0
         <if test="tenantId != null and tenantId != ''">
-           and tenant_id = #{tenantId}
+           and d.tenant_id = #{tenantId}
         </if>
     </select>
 
     <select id="selectCalssNum" resultType="int">
-        select count(*)
+        select count(d.dept_id)
         from sys_dept d
                  left join sys_dept p on d.parent_id = p.dept_id
-        where p.parent_id = 100
+        left join sys_dept pp on pp.dept_id = p.parent_id
+        where pp.parent_id = 0
         <if test="tenantId != null and tenantId != ''">
             and d.tenant_id = #{tenantId}
         </if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml
index 6329a03..beea35b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml
@@ -18,14 +18,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         with recursive cte as (select *
                                from sys_catalog_resource
                                where type = 2
+                                 and del_flag = 0
+                                 and tenant_id = #{tenantId}
                                union all
                                select d.*
                                from sys_catalog_resource d
-                                        inner join cte on d.parent_id = cte.catalog_id)
+                                        inner join cte on d.parent_id = cte.catalog_id
+                               where d.del_flag = 0
+                                 and d.tenant_id = #{tenantId})
         select t.catalog_id              as catalogId,
                any_value(t.catalog_name) as catalogName,
                any_value(t.create_time)  as createTime,
-               any_value(t.cover)       as coverUrl,
+               any_value(t.cover)        as coverUrl,
                count(r.id)               as resourceNum
         from cte t
                  left join sys_oss_resource r on r.catalog_id = t.catalog_id and r.status = 1