From af3aa8eed468a32d6cd9f09e759e8f1d1bc4796a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 16 Jun 2026 11:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1685=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dal/mysql/organ/OrganMapper.java   | 24 +++++++++----------
 .../service/organ/OrganServiceImpl.java       |  9 +++++--
 .../resources/mapper/organ/OrganMapper.xml    |  9 +++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
index 50fddbf4a..e70ab0d90 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
@@ -80,19 +80,19 @@ public interface OrganMapper extends BaseMapperX<OrganizationDO> {
                 .eq(OrganizationDO::getDeleted, OrderDeletedEnum.NOT_DELETED.getStatus())));
     }
 
-    default Integer selectOrgCountAdd() {
-        return Math.toIntExact(selectCount(new LambdaQueryWrapperX<OrganizationDO>()
-                .eq(OrganizationDO::getDeleted, OrderDeletedEnum.NOT_DELETED.getStatus())
-                .between(OrganizationDO::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT),
-                        LocalDateTime.of(LocalDate.now(), LocalTime.of(23, 59, 59)))));
-    }
+    /**
+     * 查询今天创建的组织
+     *
+     * @return
+     */
+    Integer selectOrgCountAdd(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
 
-    default Integer selectOrgCountDel() {
-        return Math.toIntExact(selectCount(new LambdaQueryWrapperX<OrganizationDO>()
-                .eq(OrganizationDO::getDeleted, OrderDeletedEnum.DELETED.getStatus())
-                .between(OrganizationDO::getUpdateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT),
-                        LocalDateTime.of(LocalDate.now(), LocalTime.of(23, 59, 59)))));
-    }
+    /**
+     * 查询今天被删除的组织
+     *
+     * @return
+     */
+    Integer selectOrgCountDel(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
 
     Integer selectOrgSilentCount(@Param("dateTime")LocalDateTime dateTime);
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
index 305ddbfaa..e0b978f15 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
@@ -83,7 +83,9 @@ import org.springframework.validation.annotation.Validated;
 
 import jakarta.annotation.Resource;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -587,12 +589,15 @@ public class OrganServiceImpl implements OrganService {
     public ManageOrgTotalStatisticRespVO getOrgTotal() {
         ManageOrgTotalStatisticRespVO respVO = new ManageOrgTotalStatisticRespVO();
 
+        LocalDate now = LocalDate.now();
+        LocalDateTime todayStart = LocalDateTime.of(now, LocalTime.MIDNIGHT);
+        LocalDateTime todayEnd = LocalDateTime.of(now, LocalTime.of(23, 59, 59));
         // 组织总数
         respVO.setOrgTotal(organMapper.selectOrgCount());
         // 当日新增数
-        respVO.setOrgAdd(organMapper.selectOrgCountAdd());
+        respVO.setOrgAdd(organMapper.selectOrgCountAdd(todayStart, todayEnd));
         // 当日状态-删除
-        respVO.setOrgDel(organMapper.selectOrgCountDel());
+        respVO.setOrgDel(organMapper.selectOrgCountDel(todayStart, todayEnd));
         // 当日沉寂数 (组织中所有用户30天未登录)
         // 获得30天前的时间，赋值时间为0：00：00
         Date date = DateUtil.offsetDay(new Date(), -30);
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml
index 7a9d231cd..6db95af80 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml
@@ -13,7 +13,16 @@
         AND ul.id IS NULL;
     </select>
 
+    <select id="selectOrgCountAdd">
+        select count(*) from system_organization
+        WHERE create_time BETWEEN #{startTime} AND #{endTime}
+    </select>
 
+    <select id="selectOrgCountDel">
+        select count(*) from system_organization
+        WHERE deleted = true
+        AND update_time BETWEEN #{startTime} AND #{endTime}
+    </select>
 
 
     <select id="selectOrganDataSource" resultType="java.util.Map">