From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/controller/MenuMappingController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java b/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java
index 08bfbff..56632db 100644
--- a/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java
@@ -91,14 +91,17 @@
String menuId = menuMapping.getMenuId();
SysMenu menu = menuService.selectById(menuId);
String preParentId = menu.getParentId();
- menu.setName(menuMapping.getName()).updateById();
+
String themeId = menuMapping.getThemeId();
-// if (!preParentId.equalsIgnoreCase(themeId)) {
-//// menu.setParentId(themeId);
-//// menu.updateById();
-//// }
+ if (!preParentId.equalsIgnoreCase(themeId)) {
+ menu.setParentId(themeId);
+ menu.updateById();
+ }
boolean updated = menuMapping.updateById();
if (updated) {
+
+
+
TUser user = DbUtils.getUser(request);
if (menu != null) {
LinkedHashSet<String> parentIdSet = new LinkedHashSet<>();
--
Gitblit v1.8.0