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

master
yang 2025-04-10 15:15:20 +08:00
commit 0005e1da6b
2 changed files with 3 additions and 3 deletions

View File

@ -733,8 +733,8 @@ public class SysUserServiceImpl implements ISysUserService
@Override @Override
public UserDataVo getUserData() { public UserDataVo getUserData() {
return UserDataVo.builder() return UserDataVo.builder()
.userCount(this.getMonthUserCount()) .userCount(this.getUserCount())
.monthUserCount(this.getUserCount()) .monthUserCount(this.getMonthUserCount())
.build(); .build();
} }

View File

@ -182,7 +182,7 @@
</select> </select>
<select id="getUserCount" resultType="java.lang.Integer"> <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>
<select id="getMonthUserCount" resultType="java.lang.Integer"> <select id="getMonthUserCount" resultType="java.lang.Integer">