Skip to content

H
haoban-manage3.0
Commit 45cf3fd4 by 墨竹
Options

fix:权限菜单树

parent b4e28246
Showing with 56 additions and 41 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
...@@ -43,14 +43,9 @@ public interface TabHaobanMenuMapper { ...@@ -43,14 +43,9 @@ public interface TabHaobanMenuMapper {
*/ */
int update(TabHaobanMenu tabHaobanMenu); int update(TabHaobanMenu tabHaobanMenu);
/** List<TabHaobanMenu> getPidMenuList();
* 获取所有菜单
* List<TabHaobanMenu> getNotPidMenuList();
* @return {@link List }<{@link TabHaobanMenu }>
* @author mozhu
* @date 2022-09-07 09:54:05
*/
List<TabHaobanMenu> getAllMenuList();
/** /**
...@@ -60,7 +55,10 @@ public interface TabHaobanMenuMapper { ...@@ -60,7 +55,10 @@ public interface TabHaobanMenuMapper {
* @param clerkType 职员类型 * @param clerkType 职员类型
* @return {@link List}<{@link TabHaobanMenu}> * @return {@link List}<{@link TabHaobanMenu}>
*/ */
List<TabHaobanMenu> getHaobanMenuList(@Param("wxEnterpriseId") String wxEnterpriseId, List<TabHaobanMenu> getHaobanPidMenuList(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("clerkType") Integer clerkType);
List<TabHaobanMenu> getHaobanNotPidMenuList(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("clerkType") Integer clerkType); @Param("clerkType") Integer clerkType);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanMenu.java
...@@ -30,10 +30,6 @@ public class TabHaobanMenu implements Serializable { ...@@ -30,10 +30,6 @@ public class TabHaobanMenu implements Serializable {
*/ */
private String iconUrl; private String iconUrl;
/** /**
* 层级
*/
private Integer menuLevel;
/**
* 0:菜单；1:按钮 * 0:菜单；1:按钮
*/ */
private Integer menuType; private Integer menuType;
...@@ -88,14 +84,6 @@ public class TabHaobanMenu implements Serializable { ...@@ -88,14 +84,6 @@ public class TabHaobanMenu implements Serializable {
this.iconUrl = iconUrl; this.iconUrl = iconUrl;
} }
public Integer getMenuLevel() {
return menuLevel;
}
public void setMenuLevel(Integer menuLevel) {
this.menuLevel = menuLevel;
}
public Integer getMenuType() { public Integer getMenuType() {
return menuType; return menuType;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
...@@ -58,24 +58,28 @@ public class HaobanMenuServiceImpl implements HaobanMenuService { ...@@ -58,24 +58,28 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
@Override @Override
public List<HaobanMenuBO> getMenuTreeList() { public List<HaobanMenuBO> getMenuTreeList() {
List<TabHaobanMenu> allMenuList = tabHaobanMenuMapper.getAllMenuList(); List<TabHaobanMenu> pidMenuList = tabHaobanMenuMapper.getPidMenuList();
List<HaobanMenuBO> menuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, allMenuList); List<TabHaobanMenu> notPidMenuList = tabHaobanMenuMapper.getNotPidMenuList();
for (HaobanMenuBO haobanMenuBO : menuBOList) { List<HaobanMenuBO> pidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, pidMenuList);
List<HaobanMenuBO> menus = iterateMenus(menuBOList, haobanMenuBO.getMenuCode()); List<HaobanMenuBO> notPidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, notPidMenuList);
for (HaobanMenuBO haobanMenuBO : pidMenuBOList) {
List<HaobanMenuBO> menus = iterateMenus(notPidMenuBOList, haobanMenuBO.getMenuCode());
haobanMenuBO.setMenuBOList(menus); haobanMenuBO.setMenuBOList(menus);
} }
return menuBOList; return pidMenuBOList;
} }
@Override @Override
public List<HaobanMenuBO> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType) { public List<HaobanMenuBO> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType) {
List<TabHaobanMenu> tabHaobanMenuList = tabHaobanMenuMapper.getHaobanMenuList(wxEnterpriseId, clerkType); List<TabHaobanMenu> pidMenuList = tabHaobanMenuMapper.getHaobanPidMenuList(wxEnterpriseId, clerkType);
List<HaobanMenuBO> menuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, tabHaobanMenuList); List<TabHaobanMenu> notPidMenuList = tabHaobanMenuMapper.getHaobanPidMenuList(wxEnterpriseId, clerkType);
for (HaobanMenuBO haobanMenuBO : menuBOList) { List<HaobanMenuBO> pidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, pidMenuList);
List<HaobanMenuBO> menus = iterateMenus(menuBOList, haobanMenuBO.getMenuCode()); List<HaobanMenuBO> notPidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, notPidMenuList);
for (HaobanMenuBO haobanMenuBO : pidMenuBOList) {
List<HaobanMenuBO> menus = iterateMenus(notPidMenuBOList, haobanMenuBO.getMenuCode());
haobanMenuBO.setMenuBOList(menus); haobanMenuBO.setMenuBOList(menus);
} }
return menuBOList; return pidMenuBOList;
} }
public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) { public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) {
......
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<result property="menuName" column="menu_name" jdbcType="VARCHAR"/> <result property="menuName" column="menu_name" jdbcType="VARCHAR"/>
<result property="menuUrl" column="menu_url" jdbcType="VARCHAR"/> <result property="menuUrl" column="menu_url" jdbcType="VARCHAR"/>
<result property="iconUrl" column="icon_url" jdbcType="VARCHAR"/> <result property="iconUrl" column="icon_url" jdbcType="VARCHAR"/>
<result property="menuLevel" column="menu_level" jdbcType="INTEGER"/>
<result property="menuType" column="menu_type" jdbcType="INTEGER"/> <result property="menuType" column="menu_type" jdbcType="INTEGER"/>
<result property="menuSort" column="menu_sort" jdbcType="INTEGER"/> <result property="menuSort" column="menu_sort" jdbcType="INTEGER"/>
<result property="parentCode" column="parent_code" jdbcType="VARCHAR"/> <result property="parentCode" column="parent_code" jdbcType="VARCHAR"/>
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time menu_code, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time
</sql> </sql>
<!--查询单个--> <!--查询单个-->
...@@ -31,17 +30,17 @@ ...@@ -31,17 +30,17 @@
<!--新增所有列--> <!--新增所有列-->
<insert id="insert" keyProperty="menuId" useGeneratedKeys="true"> <insert id="insert" keyProperty="menuId" useGeneratedKeys="true">
insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time) insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time)
values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuLevel}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},#{routePath}, #{createTime}, #{updateTime}) values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},#{routePath}, #{createTime}, #{updateTime})
</insert> </insert>
<insert id="insertBatch" keyProperty="menuId" useGeneratedKeys="true"> <insert id="insertBatch" keyProperty="menuId" useGeneratedKeys="true">
insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type,
menu_sort, parent_code, status_flag,route_path, create_time, update_time) menu_sort, parent_code, status_flag,route_path, create_time, update_time)
values values
<foreach collection="entities" item="entity" separator=","> <foreach collection="entities" item="entity" separator=",">
(#{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl}, (#{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl},
#{entity.menuLevel}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode},
#{entity.statusFlag},#{entity.routePath}, #{entity.statusFlag},#{entity.routePath},
#{entity.createTime}, #{entity.updateTime}) #{entity.createTime}, #{entity.updateTime})
</foreach> </foreach>
...@@ -61,9 +60,6 @@ ...@@ -61,9 +60,6 @@
<if test="iconUrl != null and iconUrl != ''"> <if test="iconUrl != null and iconUrl != ''">
icon_url = #{iconUrl}, icon_url = #{iconUrl},
</if> </if>
<if test="menuLevel != null">
menu_level = #{menuLevel},
</if>
<if test="menuType != null"> <if test="menuType != null">
menu_type = #{menuType}, menu_type = #{menuType},
</if> </if>
...@@ -97,8 +93,36 @@ ...@@ -97,8 +93,36 @@
where status_flag = 1 order by menu_sort where status_flag = 1 order by menu_sort
</select> </select>
<select id="getPidMenuList" resultMap="TabHaobanMenuMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_menu
where status_flag = 1 and parent_code = 'workbench' order by menu_sort
</select>
<select id="getNotPidMenuList" resultMap="TabHaobanMenuMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_menu
where status_flag = 1 and parent_code != 'workbench' order by menu_sort
</select>
<select id="getHaobanPidMenuList" resultMap="TabHaobanMenuMap">
select
c.*
from tab_haoban_role_menu a
left join tab_haoban_role b on a.role_id = b.role_id
left join tab_haoban_menu c on c.menu_code = a.menu_code
where
a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1
and c.parent_code = 'workbench'
order by c.menu_sort
</select>
<select id="getHaobanMenuList" resultMap="TabHaobanMenuMap"> <select id="getHaobanNotPidMenuList" resultMap="TabHaobanMenuMap">
select select
c.* c.*
from tab_haoban_role_menu a from tab_haoban_role_menu a
...@@ -108,6 +132,7 @@ ...@@ -108,6 +132,7 @@
a.clerk_type = #{clerkType} a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId} and a.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1 and c.status_flag = 1
and c.parent_code != 'workbench'
order by c.menu_sort order by c.menu_sort
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment