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

Compare commits

base: CY:0005e1da6b349e14a49b0c2ddae4b7bd04150b68
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:76e7619eac9a6414d15b2a884dfbe61cbe27eb6f
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "0005e1da6b349e14a49b0c2ddae4b7bd04150b68" and "76e7619eac9a6414d15b2a884dfbe61cbe27eb6f" have entirely different histories.
0005e1da6b ... 76e7619eac

2 changed files with 3 additions and 3 deletions
Show Stats 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 @Override
public UserDataVo getUserData() { public UserDataVo getUserData() {
return UserDataVo.builder() return UserDataVo.builder()
.userCount(this.getUserCount()) .userCount(this.getMonthUserCount())
.monthUserCount(this.getMonthUserCount()) .monthUserCount(this.getUserCount())
.build(); .build();
} }

2
mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
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 where del_flag = '0' select COALESCE(count(*), 0) from sys_user
</select> </select>
<select id="getMonthUserCount" resultType="java.lang.Integer"> <select id="getMonthUserCount" resultType="java.lang.Integer">