CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
yang 2025-04-10 15:15:20 +08:00
parent 76e7619eac f3e5e93173
commit 0005e1da6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
View File

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

2
mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

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