diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/TreeNode.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/TreeNode.java index 120f9be..7dc21f6 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/TreeNode.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/TreeNode.java @@ -1,6 +1,7 @@ package com.securitycontrol.entity.system.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,6 +30,10 @@ public class TreeNode { @JsonInclude(JsonInclude.Include.NON_EMPTY) private String level; + @ApiModelProperty(value = "是否禁用") + @JsonProperty("isDisabled") + private boolean isDisabled = false; + @ApiModelProperty(value = "子节点") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children = new ArrayList<>(); diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index 48507d4..054c356 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -2,6 +2,7 @@ package com.securitycontrol.system.base.controller; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.system.dto.MenuDto; import com.securitycontrol.system.base.service.ISelectService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; @@ -37,7 +38,8 @@ public class SelectController extends BaseController { @ApiOperation(value = "菜单树") @PostMapping("getMenuTree") - public AjaxResult getMenuTree(){ - return service.getMenuTree(); + public AjaxResult getMenuTree(MenuDto dto){ + return service.getMenuTree(dto); } + } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index 002ca2f..af96b13 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -1,6 +1,7 @@ package com.securitycontrol.system.base.service; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.system.dto.MenuDto; /** * @author:cwchen @@ -22,7 +23,6 @@ public interface ISelectService { /** * 角色下拉选 - * * @return AjaxResult * @description 角色下拉选 * @author cwchen @@ -33,9 +33,10 @@ public interface ISelectService { /** * 菜单树 * @return AjaxResult + * @param dto * @description 菜单树 * @author cwchen * @date 2024/2/26 13:33 */ - AjaxResult getMenuTree(); + AjaxResult getMenuTree(MenuDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index b9a2a40..cf16588 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -2,6 +2,7 @@ package com.securitycontrol.system.base.service.impl; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.system.TreeBuild; +import com.securitycontrol.entity.system.dto.MenuDto; import com.securitycontrol.entity.system.vo.SelectVo; import com.securitycontrol.entity.system.vo.TreeNode; import com.securitycontrol.system.base.mapper.ISelectMapper; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author:cwchen @@ -50,12 +52,19 @@ public class SelectServiceImpl implements ISelectService { } @Override - public AjaxResult getMenuTree() { + public AjaxResult getMenuTree(MenuDto dto) { List groupList = new ArrayList<>(); try { List list = mapper.getMenuTree(); if (CollectionUtils.isNotEmpty(list)) { // 创建树形结构(数据集合作为参数) + if(dto.getMenuId() != null){ + list.forEach(item->{ + if(Objects.equals(dto.getMenuId() + "",item.getId())){ + item.setDisabled(true); + } + }); + } groupList = TreeBuild.transTreeList(list); } } catch (Exception e) {