角色管理

src/main/java/com/kiisoo/ic/system/bean/PrivilageRoleAccountBean.java

@@ -13,7 +13,7 @@ public class PrivilageRoleAccountBean {
     /**
      * 角色id
      */
-    private Long roleId;
+    private Long id;
 
     /**
      * 代码
@@ -28,7 +28,7 @@ public class PrivilageRoleAccountBean {
     /**
      * 角色下的账户个数
      */
-    private Integer count;
+    private Integer number;
 
     /**
      * 用于判断是否可以修改1.不可以 2.可以

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageRoleServiceImpl.java

@@ -105,11 +105,11 @@ public class PrivilageRoleServiceImpl extends ServiceImpl<PrivilageRoleDOMapper,
             PrivilageRoleAccountBean accountBean = new PrivilageRoleAccountBean();
             accountBean.setCode(privilageRoleDO.getCode());
             accountBean.setName(privilageRoleDO.getName());
-            accountBean.setRoleId(privilageRoleDO.getId());
+            accountBean.setId(privilageRoleDO.getId());
             QueryWrapper<PrivilageUserRoleDO> wrapper = new QueryWrapper<>();
             wrapper.eq("role_id",privilageRoleDO.getId());
             Integer count = privilageUserRoleDOMapper.selectCount(wrapper);
-            accountBean.setCount(count);
+            accountBean.setNumber(count);
             if(RoleEnum.ROLE_CODE_NULL.equals(RoleEnum.getRoleByCode(privilageRoleDO.getCode()))){
                 //此角色可以修改
                 accountBean.setType(2);
@@ -117,6 +117,7 @@ public class PrivilageRoleServiceImpl extends ServiceImpl<PrivilageRoleDOMapper,
                 //此角色不可以修改
                 accountBean.setType(1);
             }
+            list.add(accountBean);
         });
         return list;
     }