Merge branch 'refs/heads/feature/community-center' into preview

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();
     }
 

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">