diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java index 7d86e0a3..a0174b7e 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java @@ -1,7 +1,9 @@ package com.cloud.kicc.system.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.TreeEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -62,4 +64,12 @@ public class Menu extends TreeEntity { */ private String hideChildrenMenu; + /** + * 新增时所需当前菜单的所有父级id + * 进行修改角色模块的勾选类型,半选还是全选 + */ + @ApiModelProperty("所有父级id") + @TableField(exist = false) + private String[] parentIds; + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java index 8bb942a4..81835eb9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java @@ -19,10 +19,7 @@ import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -80,12 +77,10 @@ public class MenuController { @PreAuthorize("@pms.hasPermission('menu_add')") public R save(@RequestBody Menu menu) { RoleMenu roleMenu = new RoleMenu(); - if (menu.getParentId()!="0"){ - roleMenuService.update(Wrappers.lambdaUpdate() - .eq(RoleMenu::getRoleId,roleMenu.getRoleId()) - .eq(RoleMenu::getMenuId,menu.getParentId()) - .set(RoleMenu::getCheckeType, "2")); - } + roleMenuService.update(Wrappers.lambdaUpdate() + .eq(RoleMenu::getRoleId,roleMenu.getRoleId()) + .in(RoleMenu::getMenuId, menu.getParentIds()) + .set(RoleMenu::getCheckeType, "2")); menuService.save(menu); return R.ok(); }