Merge branch 'refs/heads/feature/community-center' into preview
commit
0005e1da6b
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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">
|
||||||
|
|
Loading…
Reference in New Issue