From 336f3a0e489cbcbccd0333879158d1606dcb2ad3 Mon Sep 17 00:00:00 2001
From: WenG <450292408@qq.com>
Date: Mon, 5 Apr 2021 23:15:58 +0800
Subject: [PATCH] solve the menu problem

---
 .../wgink/module/menu/service/impl/MenuServiceImpl.java    | 2 +-
 service-menu/src/main/resources/templates/menu/list.html   | 7 +++----
 .../service/role/service/impl/RoleMenuServiceImpl.java     | 7 +++++++
 .../src/main/resources/mybatis/mapper/role-menu-mapper.xml | 6 ++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
index 3d967baa..5cdbce0a 100644
--- a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
+++ b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
@@ -51,7 +51,7 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
         List<MenuDTO> srcMenuDTOs = menuDao.list(params);
         List<MenuDTO> desMenuDTOs = Arrays.asList(new MenuDTO[srcMenuDTOs.size()]);
         Collections.copy(desMenuDTOs, srcMenuDTOs);
-        return srcMenuDTOs;
+        return desMenuDTOs;
     }
 
     @Override
diff --git a/service-menu/src/main/resources/templates/menu/list.html b/service-menu/src/main/resources/templates/menu/list.html
index eedf0156..ee4b3aca 100644
--- a/service-menu/src/main/resources/templates/menu/list.html
+++ b/service-menu/src/main/resources/templates/menu/list.html
@@ -179,10 +179,9 @@
                     top.dialog.close(index);
                     var layIndex;
                     top.restAjax.delete(top.restAjax.path('api/menu/remove/{ids}', [ids]), {}, null, function (code, data) {
-                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () {
-                            parent.common.refreshTree('leftTree');
-                            reloadTable();
-                        });
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 3000});
+                        parent.common.refreshTree('leftTree');
+                        reloadTable();
                     }, function (code, data) {
                         top.dialog.msg(data.msg);
                     }, function () {
diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java
index 5813e1da..27a049fb 100644
--- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java
+++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java
@@ -62,6 +62,13 @@ public class RoleMenuServiceImpl extends DefaultBaseService implements IRoleMenu
         return roleMenuDao.listMenuId(params);
     }
 
+    @Override
+    public List<String> listMenuId(List<String> roleIds) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("roleIds", roleIds);
+        return roleMenuDao.listMenuId(params);
+    }
+
     @Override
     public List<String> listMenuUrl(String roleId) {
         List<String> menuIds = listMenuId(roleId);
diff --git a/service-role/src/main/resources/mybatis/mapper/role-menu-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-menu-mapper.xml
index 4eeff5e5..a4f7b92e 100644
--- a/service-role/src/main/resources/mybatis/mapper/role-menu-mapper.xml
+++ b/service-role/src/main/resources/mybatis/mapper/role-menu-mapper.xml
@@ -64,6 +64,12 @@
         <if test="roleId != null and roleId != ''">
             role_id = #{roleId}
         </if>
+        <if test="roleIds != null and roleIds.size > 0">
+            role_id IN
+            <foreach collection="roleIds" index="index" open="(" separator="," close=")">
+                #{roleIds[${index}]}
+            </foreach>
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file