From 516a6aa64170b23df3704b945aa02937a6716a57 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Wed, 26 Jun 2024 18:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/StatisticMapper.xml         | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

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 23fc32c..3a47e60 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
@@ -7,6 +7,7 @@
         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
+        and d.del_flag = 0
         <if test="tenantId != null and tenantId != ''">
            and d.tenant_id = #{tenantId}
         </if>
@@ -18,6 +19,7 @@
                  left join sys_dept p on d.parent_id = p.dept_id
         left join sys_dept pp on pp.dept_id = p.parent_id
         where pp.parent_id = 0
+        and d.del_flag = 0
         <if test="tenantId != null and tenantId != ''">
             and d.tenant_id = #{tenantId}
         </if>
@@ -26,31 +28,28 @@
     <select id="selectTeacherNum" resultType="int">
         select count(*)
         from sys_teacher
-        <where>
-            <if test="tenantId != null and tenantId != ''">
-                and tenant_id = #{tenantId}
-            </if>
-        </where>
+        where del_flag = 0
+        <if test="tenantId != null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
     </select>
 
     <select id="selectTextbookNum" resultType="int">
         select count(*)
         from sys_oss_textbook
-        <where>
-            <if test="tenantId != null and tenantId != ''">
-                and tenant_id = #{tenantId}
-            </if>
-        </where>
+        where status = 1
+        <if test="tenantId != null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
     </select>
 
     <select id="selectResourceNum" resultType="int">
         select count(*) as rNum
         from sys_oss_resource
-        <where>
-            <if test="tenantId != null and tenantId != ''">
-                and tenant_id = #{tenantId}
-            </if>
-        </where>
+        where status = 1
+        <if test="tenantId != null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
     </select>
 
     <select id="selectOssUse" resultType="org.dromara.system.domain.vo.StatisticNumVo">
@@ -86,11 +85,10 @@
                    when 4 then '试卷'
                    end  as `name`
         from sys_oss_textbook
-        <where>
-            <if test="tenantId != null and tenantId != ''">
-                and tenant_id = #{tenantId}
-            </if>
-        </where>
+        where status = 1
+        <if test="tenantId != null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
         group by type
     </select>
 </mapper>