From e3b9c572368526e925a5266f7b8a2848f4d431cd Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 16:01:16 +0800
Subject: [PATCH] #自测修改
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 4 ++--
server/company/src/main/java/com/doumee/api/system/SystemMenuController.java | 6 +++---
server/service/src/main/resources/mappers/SystemMenuMapper.xml | 2 +-
server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java | 2 +-
server/service/src/main/java/com/doumee/service/system/SystemMenuService.java | 2 +-
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 2 +-
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 6 +++---
server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java | 4 ++--
server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
index 5e4cf01..8eb4e56 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -46,10 +46,10 @@
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList")
+ @PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
- public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTree());
+ public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(type));
}
@PreventRepeat
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index 5e4cf01..8eb4e56 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -46,10 +46,10 @@
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList")
+ @PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
- public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTree());
+ public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(type));
}
@PreventRepeat
diff --git a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
index 8234f66..87706a0 100644
--- a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
+++ b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
@@ -47,7 +47,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findTree();
+ List<SystemMenuListVO> findTreeByType(Integer type);
/**
* 鍒犻櫎
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index 7f17be8..d16927f 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -92,8 +92,8 @@
}
@Override
- public List<SystemMenuListVO> findTree() {
- List<SystemMenuListVO> menus = systemMenuService.findList();
+ public List<SystemMenuListVO> findTreeByType(Integer type) {
+ List<SystemMenuListVO> menus = systemMenuService.findList(type);
List<SystemMenuListVO> rootMenus = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
for (SystemMenu menu : menus) {
diff --git a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
index 02b695d..0140855 100644
--- a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
@@ -13,7 +13,7 @@
* @author Eva.Caesar Liu
* @date 2023/02/14 11:14
*/
- List<SystemMenuListVO> selectManageList();
+ List<SystemMenuListVO> selectManageList(Integer type);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ
diff --git a/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java b/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
index 108a492..0cffecb 100644
--- a/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
+++ b/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
@@ -73,7 +73,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findList();
+ List<SystemMenuListVO> findList(Integer type);
/**
* 鏌ヨ涓�绾ц彍鍗曞垪琛�
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
index 716d684..de0f384 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
@@ -83,8 +83,8 @@
}
@Override
- public List<SystemMenuListVO> findList() {
- return systemMenuMapper.selectManageList();
+ public List<SystemMenuListVO> findList(Integer type) {
+ return systemMenuMapper.selectManageList(type);
}
@Override
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index fd6827f..7a8c126 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -121,7 +121,7 @@
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
diff --git a/server/service/src/main/resources/mappers/SystemMenuMapper.xml b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
index 39df661..51d06ff 100644
--- a/server/service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -23,7 +23,7 @@
JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
<where>
- menu.DELETED = 0
+ menu.DELETED = 0 and menu.type = {type}
</where>
ORDER BY menu.SORT
</select>
--
Gitblit v1.9.3