*

lsh

8 天以前 31923911748e867d11365cbd0143e3460f8e9178

 src/main/java/com/zy/system/controller/RoleController.java

@@ -59,9 +59,9 @@
            }
        }

        List<Role> roleList = roleService.selectRoleList(leaderIdList,curr,limit);
        List<Role> roleList = roleService.selectRoleList(leaderIdList.isEmpty() ? null:leaderIdList,curr,limit);
        Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
        page.setTotal(roleService.selectRoleListTotal(leaderIdList));
        page.setTotal(roleService.selectRoleListTotal(leaderIdList.isEmpty() ? null:leaderIdList));
        return R.ok(page);
    }

@@ -135,12 +135,13 @@
        EntityWrapper<Role> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        // 上下级管理
        List<Long> leaderIds = new ArrayList<>();

        if (9527 != getUserId()) {
            Long roleId = getUser().getRoleId();
            Role role = roleService.selectById(roleId);
            Long leaderId = role.getLeader();
            if (null != leaderId) {
                List<Long> leaderIds = new ArrayList<>();
                while (leaderId != null) {
                    Role leader = roleService.selectById(leaderId);
                    leaderIds.add(leader.getId());
@@ -153,7 +154,12 @@
//            }
        }

        Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
//        Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);

        List<Role> roleList = roleService.selectRoleList((Cools.isEmpty(leaderIds) || leaderIds.isEmpty())? null : leaderIds,0,10);
        Page<Role> page = new Page<Role>(0,10).setRecords(roleList);
        page.setTotal(roleService.selectRoleListTotal((Cools.isEmpty(leaderIds) || leaderIds.isEmpty())? null : leaderIds));

        List<Map<String, Object>> result = new ArrayList<>();
        for (Role role : page.getRecords()){
            Map<String, Object> map = new HashMap<>();