xuhy
12 小时以前 324b77e6d0d763d7da5138ce18c5e3f3534d9075
bug修改
3个文件已修改
10 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/authority/controller/SecResourcesController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/authority/controller/SecRoleController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TModelController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/authority/controller/SecResourcesController.java
@@ -46,7 +46,7 @@
    }
    @ApiOperation(value = "获取所有资源(菜单及功能)", notes = "获取所有资源(菜单及功能)")
    @GetMapping(value = "dist")
    @PostMapping(value = "/dist")
    public ApiResult<List<SecResourceVO>> listAll() {
        List<SecResourceVO> sysResourceVos = secResourcesService.selectResources();
        return ApiResult.success(sysResourceVos);
manage/src/main/java/com/jilongda/manage/authority/controller/SecRoleController.java
@@ -72,8 +72,8 @@
    }
    @ApiOperation(value = "获取角色权限---无层级", notes = "获取角色权限无层级,传递角色id即可")
    @GetMapping(value = "resource/nolevel/{rid}")
    public ApiResult<List<SecResources>> roleResourceNolevel(@PathVariable Long rid) {
    @PutMapping(value = "/resource/nolevel")
    public ApiResult<List<SecResources>> roleResourceNolevel(@RequestParam Long rid) {
        List<SecRoleResource> secRoleResources = secRoleResourceMapper.selectList(Wrappers.lambdaQuery(SecRoleResource.class).eq(SecRoleResource::getRoleId, rid));
        List<SecResources> secResources = new ArrayList<>();
        if (!CollectionUtils.isEmpty(secRoleResources)) {
manage/src/main/java/com/jilongda/manage/controller/TModelController.java
@@ -95,13 +95,14 @@
        List<String> colorList = dto.getColorList();
        if (list.size()<colorList.size()){
            for (int i = 0; i < colorList.size(); i++) {
                if (i>list.size()-1){
                if (i>list.size()){
                    TModel model = new TModel();
                    BeanUtils.copyProperties(dto, model);
                    model.setId(null);
                    model.setColor(colorList.get(i));
                    list.add(model);
                }else {
                    BeanUtils.copyProperties(dto, list.get(i));
                    list.get(i).setColor(colorList.get(i));
                }
            }
@@ -121,6 +122,7 @@
                    .collect(Collectors.toList()));
        }else {
            for (int i = 0; i < list.size(); i++) {
                BeanUtils.copyProperties(dto, list.get(i));
                list.get(i).setColor(colorList.get(i));
            }
        }