1

src/main/java/com/fdkankan/manage/mapper/IUserMapper.java

@@ -2,8 +2,11 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.response.SysRoleVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户信息表 Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IUserMapper extends BaseMapper<User> {
 
+    List<SysRoleVo> groupByRoleId();
 }

src/main/java/com/fdkankan/manage/mq/publisher/SceneDelNumMq.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 @Data
 @AllArgsConstructor
-public class SceneDelNumMq implements Serializable {
+public class SceneDelNumMq  {
     private String num;
     private String dataSource;
     private String version;

src/main/java/com/fdkankan/manage/service/IUserService.java

@@ -45,4 +45,6 @@ public interface IUserService extends IService<User> {
     ManageLoginResponse getUserByUserNameAndPassword(String userName, String passwordMd5);
 
     void updatePassword(SysUserParam param);
+
+    HashMap<Long, Long> groupByRoleId();
 }

src/main/java/com/fdkankan/manage/service/impl/SysRoleServiceImpl.java

@@ -10,10 +10,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.ISysRoleMapper;
-import com.fdkankan.manage.service.ISysMenuService;
-import com.fdkankan.manage.service.ISysRoleMenuService;
-import com.fdkankan.manage.service.ISysRoleService;
-import com.fdkankan.manage.service.ISysUserService;
+import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.vo.request.SysRoleMenuParam;
 import com.fdkankan.manage.vo.request.SysRoleParam;
 import com.fdkankan.manage.vo.response.SysRoleVo;
@@ -44,6 +41,8 @@ public class SysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> imp
     ISysRoleMenuService roleMenuService;
     @Autowired
     ISysMenuService sysMenuService;
+    @Autowired
+    IUserService userService;
 
     @Override
     public void addOrUpdate(SysRoleParam param) {
@@ -55,7 +54,7 @@ public class SysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> imp
 
     @Override
     public PageInfo pageList(SysRoleParam param) {
-        HashMap<Long,Long> countMap = sysUserService.groupByRoleId();
+        HashMap<Long,Long> countMap = userService.groupByRoleId();
         Page<SysRoleVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (SysRoleVo record : page.getRecords()) {
             record.setAdminCount(countMap.get(record.getId()) == null ? 0 : countMap.get(record.getId()));

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@ import com.fdkankan.manage.vo.request.SysUserParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
+import com.fdkankan.manage.vo.response.SysRoleVo;
 import com.fdkankan.manage.vo.response.UserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -328,4 +329,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         wrapper.set(User::getPassword,passwordMd5);
         this.update(wrapper);
     }
+
+    @Override
+    public HashMap<Long, Long> groupByRoleId() {
+        HashMap<Long, Long>  map = new HashMap<>();
+        List<SysRoleVo> roleVos = this.getBaseMapper().groupByRoleId();
+        for (SysRoleVo roleVo : roleVos) {
+            map.put(roleVo.getId(),roleVo.getAdminCount());
+        }
+        return map;
+    }
 }

src/main/resources/mapper/manage/SysRoleMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SysRoleVo" parameterType="com.fdkankan.manage.vo.request.SysRoleParam">
         select  r.* ,u.nick_name as createUserName  from sys_role r
-        left join sys_user u on r.create_user_id = u.id
+        left join t_user u on r.create_user_id = u.id
         <where>
             and r.rec_status = 'A'
             <if test="param.roleName != null and param.roleName!=''">

src/main/resources/mapper/manage/UserMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IUserMapper">
 
+    <select id="groupByRoleId" resultType="com.fdkankan.manage.vo.response.SysRoleVo">
+        select role_id as id , count(id) as adminCount from t_user_role where rec_status = 'A' group by role_id
+    </select>
 </mapper>