From 5268a2b7dfa556bd6f5a2d5e446cea3ea9940c10 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 四月 2020 11:18:23 +0800
Subject: [PATCH] add 分发 master_author 添加字段 subscribe increment， 添加7个表 master_author_subscribe master_author_unactive sys_dispense_config sys_dispense_logs sys_view sys_view_join sys_view_logic
---
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index 08cc76b..0dc819c 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -105,12 +105,10 @@
return Result.success(null);
}
LinkedHashSet<String> parentIdSet = new LinkedHashSet<>(menuIds);
- Set<String> byParentId = menuService.getByParentId(parentIdSet);
-
- if (byParentId == null || byParentId.isEmpty()) {
+ List<SysMenu> parentList = menuService.getMenuByParentId(parentIdSet);
+ if (parentList == null) {
return Result.success(null);
}
- List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
return Result.success(parentList);
}
@@ -135,8 +133,7 @@
}
parentIdSet.add(sysMenu.getId());
}
- Set<String> byParentId = menuService.getByParentId(parentIdSet);
- List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
+ List<SysMenu> parentList = menuService.getMenuByParentId(parentIdSet);
return Result.success(parentList) ;
}
@@ -201,7 +198,7 @@
menu.setId(uuid);
menu.setParentId(parentId);
menu.setOrderNo(orderno);
- menu.setMenuType(menuType);
+ menu.setMenuType(menuType).setCreateTime(new Date());
boolean inserted = menuService.insert(menu);
if (inserted) {
return Result.success(menu);
@@ -244,7 +241,7 @@
}else {
orderno = Integer.valueOf(ordernoStr);
}
- menu = new SysMenu().setId(id).setParentId(parentId).setMenuType(menuType).setName(name).setOrderNo(orderno);
+ menu = new SysMenu().setCreateTime(new Date()).setId(id).setParentId(parentId).setMenuType(menuType).setName(name).setOrderNo(orderno);
menu.insert();
}
@@ -263,9 +260,11 @@
@RequestMapping(value = "/update", method = RequestMethod.GET)
public Result<Object> update(@RequestParam String id, HttpServletRequest request) {
SysMenu menu = menuService.selectById(id);
+
if (menu == null) {
return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
}
+ menu.setUpdateTime(new Date());
String ordernoStr = request.getParameter("orderNo");
String parentId = request.getParameter("parentId");
String menuType = request.getParameter("menuType");
--
Gitblit v1.8.0