From f3e5e931731cd8fb8bf45cf64e0d4793551c1d60 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Thu, 10 Apr 2025 15:14:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mcwl/system/service/impl/SysUserServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
index 5d5bc85..a8ad1e5 100644
--- a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
+++ b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
@@ -733,8 +733,8 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public UserDataVo getUserData() {
         return UserDataVo.builder()
-                .userCount(this.getMonthUserCount())
-                .monthUserCount(this.getUserCount())
+                .userCount(this.getUserCount())
+                .monthUserCount(this.getMonthUserCount())
                 .build();
     }
 
diff --git a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
index d9a9df1..be71c4f 100644
--- a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -182,7 +182,7 @@
 	</select>
 
 	<select id="getUserCount" resultType="java.lang.Integer">
-		select COALESCE(count(*), 0) from sys_user
+		select COALESCE(count(*), 0) from sys_user where del_flag = '0'
 	</select>
 
 	<select id="getMonthUserCount" resultType="java.lang.Integer">