fix:返回菜单

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java

@@ -48,6 +48,8 @@ public class HaobanRoleDTO implements Serializable {
      * 0：运维后台；1：好办web
      */
     private Integer systemFlag;
+    private List<HaobanMenuDTO> menuList;
+
 
     public Long getRoleId() {
         return roleId;
@@ -152,5 +154,13 @@ public class HaobanRoleDTO implements Serializable {
     public void setSystemFlag(Integer systemFlag) {
         this.systemFlag = systemFlag;
     }
+
+    public List<HaobanMenuDTO> getMenuList() {
+        return menuList;
+    }
+
+    public void setMenuList(List<HaobanMenuDTO> menuList) {
+        this.menuList = menuList;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java

@@ -77,19 +77,27 @@ public interface TabHaobanMenuMapper {
                                               @Param("systemFlag") Integer systemFlag);
 
     /**
-     * 获取父菜单
+     * 获取菜单code
      *
      * @param menuCodes 菜单代码
      * @return {@link List}<{@link String}>
      */
-    List<String> getHaobanMenuByPid(@Param("menuCodes") List<String> menuCodes);
+    List<String> getHaobanMenuCodeListByCode(@Param("menuCodes") List<String> menuCodes);
 
     /**
-     * 获取子菜单
+     * 获取子菜单code
      *
      * @param menuCodes 菜单代码
      * @return {@link List}<{@link String}>
      */
-    List<String> getHaobanChildMenuByPid(@Param("menuCodes") List<String> menuCodes);
+    List<String> getHaobanChildMenuCodeByPCode(@Param("menuCodes") List<String> menuCodes);
+
+    /**
+     * 获取菜单列表
+     *
+     * @param menuCodes 菜单代码
+     * @return {@link List}<{@link String}>
+     */
+    List<TabHaobanMenu> getHaobanMenuListByCode(@Param("menuCodes") List<String> menuCodes);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java

 package com.gic.haoban.manage.service.pojo.bo.role;
 
+import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -48,6 +50,7 @@ public class HaobanRoleBO implements Serializable {
      * 0：运维后台；1：好办web
      */
     private Integer systemFlag;
+    private List<HaobanMenuDTO> menuList;
 
     public Long getRoleId() {
         return roleId;
@@ -152,5 +155,13 @@ public class HaobanRoleBO implements Serializable {
     public void setSystemFlag(Integer systemFlag) {
         this.systemFlag = systemFlag;
     }
+
+    public List<HaobanMenuDTO> getMenuList() {
+        return menuList;
+    }
+
+    public void setMenuList(List<HaobanMenuDTO> menuList) {
+        this.menuList = menuList;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -7,6 +7,7 @@ import com.gic.haoban.app.customer.service.api.service.ManageSettingApiService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
+import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
 import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
@@ -14,6 +15,7 @@ import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.entity.role.TabHaobanRole;
 import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
+import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
 import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
@@ -185,6 +187,8 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         if (haobanRoleBO != null) {
             List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
             haobanRoleBO.setMenuCodes(menuCodes);
+            List<HaobanMenuBO> haobanMenuList = haobanMenuService.getHaobanMenuList(menuCodes);
+            haobanRoleBO.setMenuList(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,haobanMenuList));
         }
         return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanRoleDTO.class,haobanRoleBO));
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java

@@ -74,9 +74,18 @@ public interface HaobanMenuService {
     /**
      * 获取子菜单（包含自己）
      *
-     * @param menuCode 菜单代码
+     * @param menuCodes 菜单代码
      * @return {@link List}<{@link String}>
      */
-    List<String> getHaobanMenuByPid(List<String> menuCode);
+    List<String> getHaobanMenuByPid(List<String> menuCodes);
+
+
+    /**
+     * 获取菜单列表
+     *
+     * @param menuCodes 菜单代码
+     * @return {@link List}<{@link HaobanMenuBO}>
+     */
+    List<HaobanMenuBO> getHaobanMenuList(List<String> menuCodes);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java

@@ -99,13 +99,19 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
     @Override
     public List<String> getHaobanMenuByPid(List<String> menuCodes) {
         List<String> list = new ArrayList<>();
-        List<String> pidCodes = tabHaobanMenuMapper.getHaobanMenuByPid(menuCodes);
-        List<String> childCodes = tabHaobanMenuMapper.getHaobanChildMenuByPid(menuCodes);
+        List<String> pidCodes = tabHaobanMenuMapper.getHaobanMenuCodeListByCode(menuCodes);
+        List<String> childCodes = tabHaobanMenuMapper.getHaobanChildMenuCodeByPCode(menuCodes);
         list.addAll(pidCodes);
         list.addAll(childCodes);
         return list;
     }
 
+    @Override
+    public List<HaobanMenuBO> getHaobanMenuList(List<String> menuCodes) {
+        List<TabHaobanMenu> haobanMenuListByCode = tabHaobanMenuMapper.getHaobanMenuListByCode(menuCodes);
+        return EntityUtil.changeEntityListNew(HaobanMenuBO.class,haobanMenuListByCode);
+    }
+
     public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) {
         List<HaobanMenuBO> result = new ArrayList<>();
         for (HaobanMenuBO haobanMenuBO : menuBOList) {

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml

@@ -159,7 +159,7 @@
         order by c.menu_sort
     </select>
 
-    <select id="getHaobanMenuByPid" resultType="java.lang.String">
+    <select id="getHaobanMenuCodeListByCode" resultType="java.lang.String">
         select
         menu_code
         from tab_haoban_menu
@@ -169,7 +169,7 @@
         </foreach>
     </select>
 
-    <select id="getHaobanChildMenuByPid" resultType="java.lang.String">
+    <select id="getHaobanChildMenuCodeByPCode" resultType="java.lang.String">
         select
         menu_code
         from tab_haoban_menu
@@ -179,5 +179,15 @@
         </foreach>
     </select>
 
+    <select id="getHaobanMenuListByCode" resultMap="TabHaobanMenuMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_menu
+        where status_flag = 1 and menu_code in
+        <foreach collection="menuCodes" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </select>
+
 </mapper>