From 721a7e04f6ce55554d2e5eb8630f635c05d5bbac Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 4 Aug 2022 10:21:07 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E8=8F=9C=E5=8D=95=E5=A4=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4,=E6=94=AF=E6=8C=81=E5=A4=96=E9=93=BE=20=E5=86=85?=
 =?UTF-8?q?=E5=B5=8C=20=E5=A4=9A=E7=BA=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cloud/kicc/system/api/entity/Menu.java    | 10 ++++++++++
 .../kicc/system/controller/MenuController.java    | 15 +++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

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<Menu> {
      */
     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.<RoleMenu>lambdaUpdate()
-                    .eq(RoleMenu::getRoleId,roleMenu.getRoleId())
-                    .eq(RoleMenu::getMenuId,menu.getParentId())
-                    .set(RoleMenu::getCheckeType, "2"));
-        }
+        roleMenuService.update(Wrappers.<RoleMenu>lambdaUpdate()
+                .eq(RoleMenu::getRoleId,roleMenu.getRoleId())
+                .in(RoleMenu::getMenuId, menu.getParentIds())
+                .set(RoleMenu::getCheckeType, "2"));
         menuService.save(menu);
         return R.ok();
     }