From 5f876f590e8c6d73cf62803b69db808fe2025983 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Dec 2019 17:01:44 +0800
Subject: [PATCH] 修改树形结构显示所有渠道选择
---
src/main/java/com/moral/service/impl/RoleServiceImpl.java | 6 ++++++
src/main/java/com/moral/mapper/MenuMapper.java | 2 --
src/main/resources/mapper/ChannelMapper.xml | 8 ++++++++
src/main/resources/mapper/MenuMapper.xml | 8 --------
src/main/java/com/moral/controller/MenuController.java | 8 ++++----
src/main/java/com/moral/mapper/ChannelMapper.java | 2 ++
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/controller/MenuController.java b/src/main/java/com/moral/controller/MenuController.java
index 0b9a945..03bea43 100644
--- a/src/main/java/com/moral/controller/MenuController.java
+++ b/src/main/java/com/moral/controller/MenuController.java
@@ -18,7 +18,7 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Menu;
-import com.moral.mapper.MenuMapper;
+import com.moral.mapper.ChannelMapper;
import com.moral.mapper.RoleMenuMapper;
import com.moral.service.AccountService;
import com.moral.service.ChannelService;
@@ -32,7 +32,7 @@
MenuService menuService;
@Resource
- MenuMapper menuMapper;
+ ChannelMapper channelMapper;
@Resource
RoleMenuMapper roleMenuMapper;
@@ -95,8 +95,8 @@
@GetMapping("getZNodes")
public List<Map<String,Object>> getZNodes(Integer roleId) {
List<Map<String,Object>> zNodes= new ArrayList<>();
- List<Integer> channelIds = menuMapper.getChannelId();
- List<Integer> channels= roleMenuMapper.getChannels(roleId);
+ List<Integer> channelIds = channelMapper.getChannelId();
+ List<Integer> channels = roleMenuMapper.getChannels(roleId);
List<Integer> menus=roleMenuMapper.getMenus(roleId);
List<Menu> menuList=menuService.getZNodes();
for(Integer channelId:channelIds){
diff --git a/src/main/java/com/moral/mapper/ChannelMapper.java b/src/main/java/com/moral/mapper/ChannelMapper.java
index 6358e04..4d7cb46 100644
--- a/src/main/java/com/moral/mapper/ChannelMapper.java
+++ b/src/main/java/com/moral/mapper/ChannelMapper.java
@@ -12,4 +12,6 @@
List<Channel> getChannelList(@Param("channelName") String channelName);
+ List<Integer> getChannelId();
+
}
diff --git a/src/main/java/com/moral/mapper/MenuMapper.java b/src/main/java/com/moral/mapper/MenuMapper.java
index ba01f2a..a1a2d6b 100644
--- a/src/main/java/com/moral/mapper/MenuMapper.java
+++ b/src/main/java/com/moral/mapper/MenuMapper.java
@@ -20,8 +20,6 @@
List<Menu> getParentMenuList(@Param("menuName") String menuName);
- List<Integer> getChannelId();
-
List<Menu> getMenuListInfo();
List<Integer> getMenuOrdersByRoleId(@Param("roleId") Integer roleId);
diff --git a/src/main/java/com/moral/service/impl/RoleServiceImpl.java b/src/main/java/com/moral/service/impl/RoleServiceImpl.java
index 5126466..9bba7f8 100644
--- a/src/main/java/com/moral/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RoleServiceImpl.java
@@ -148,6 +148,12 @@
roleMenu.setChannelId(Integer.valueOf(menuOrder.toString().substring(0, 1)));
roleMenu.setMenuId(menuMap.get(menuOrder));
roleMenuList.add(roleMenu);
+ } else {
+ RoleMenu roleMenu = new RoleMenu();
+ roleMenu.setRoleId(roleId);
+ roleMenu.setChannelId(menuOrder);
+ roleMenu.setMenuId(0);
+ roleMenuList.add(roleMenu);
}
}
roleMenuMapper.insertList(roleMenuList);
diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml
index d9c5039..95532ce 100644
--- a/src/main/resources/mapper/ChannelMapper.xml
+++ b/src/main/resources/mapper/ChannelMapper.xml
@@ -30,4 +30,12 @@
and channel_name like concat('%',#{channelName},'%')
</if>
</select>
+
+ <select id="getChannelId" resultType="java.lang.Integer">
+ select
+ distinct
+ id
+ from channel
+ where channel_is_delete=1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index d77d0c5..79a4df8 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -110,14 +110,6 @@
</if>
</select>
- <select id="getChannelId" resultType="java.lang.Integer">
- select
- distinct
- channel_id
- from menu
- where is_delete=0
- </select>
-
<select id="getMenuListInfo" resultMap="ResultMap">
select
<include refid="Base_Column_List"/>
--
Gitblit v1.8.0