ソースを参照

fix:修改批量删除菜单

xuezizhuo 1 年間 前
コミット
cf0a72ccf2

+ 3 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -125,9 +125,10 @@ public class SysMenuController extends BaseController {
     /**
      * 批量删除菜单
      */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/removeBatch")
-    public AjaxResult removeBatch(@RequestParam("menuIds") List<String> menuIds) {
+    @DeleteMapping("/removeBatch/{menuIds}")
+    public AjaxResult removeBatch(@PathVariable List<Long> menuIds) {
         if(menuService.hasChildByMenuIdBatchRemove(menuIds)){
             return warn("当前选择的菜单中、存在子菜单,不允许删除");
         }

+ 1 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -215,7 +215,7 @@ public class GenUtils
      */
     public static String replaceText(String text)
     {
-        return RegExUtils.replaceAll(text, "(?:若依)", "");
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
     }
 
     /**

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -143,7 +143,7 @@ public interface SysMenuMapper {
      * @param menuIds 菜单ID
      * @return 结果
      */
-    int batchDeleteMenuById(List menuIds);
+    int batchDeleteMenuById(List<Long> menuIds);
 
     /**
      * 校验菜单名称是否唯一

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -108,7 +108,7 @@ public interface ISysMenuService
      * @param menuIds 菜单ID集合
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuIdBatchRemove(List menuIds);
+    public boolean hasChildByMenuIdBatchRemove(List<Long> menuIds);
 
 
     /**
@@ -125,7 +125,7 @@ public interface ISysMenuService
      * @param menuIds 菜单ID 集合
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRoleBatchRemove(List menuIds);
+    public boolean checkMenuExistRoleBatchRemove(List<Long> menuIds);
 
     /**
      * 新增保存菜单信息
@@ -157,7 +157,7 @@ public interface ISysMenuService
      * @param menuIds 菜单ID
      * @return 结果
      */
-    public int batchDeleteMenuByIds(List menuIds);
+    public int batchDeleteMenuByIds(List<Long> menuIds);
 
     /**
      * 校验菜单名称是否唯一

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -273,7 +273,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuIdBatchRemove(List menuIds) {
+    public boolean hasChildByMenuIdBatchRemove(List<Long> menuIds) {
         int result = menuMapper.hasChildByMenuIdBatchRemove(menuIds);
         return result > 0;
     }
@@ -297,7 +297,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRoleBatchRemove(List menuIds) {
+    public boolean checkMenuExistRoleBatchRemove(List<Long> menuIds) {
         int result = roleMenuMapper.checkMenuExistRoleBatchRemove(menuIds);
         return result > 0;
     }
@@ -341,7 +341,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return 结果
      */
     @Override
-    public int batchDeleteMenuByIds(List menuIds) {
+    public int batchDeleteMenuByIds(List<Long> menuIds) {
         return menuMapper.batchDeleteMenuById(menuIds);
     }
 

+ 2 - 2
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -176,7 +176,7 @@
 	<select id="hasChildByMenuIdBatchRemove" resultType="Integer" parameterType="java.util.List">
 		select count(1) from sys_menu where parent_id in
 		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-			#{item, jdbcType=VARCHAR}
+			#{item}
 		</foreach>
 	</select>
 
@@ -277,7 +277,7 @@
 	<delete id="batchDeleteMenuById">
 		delete from sys_menu where menu_id in
 		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-			#{item, jdbcType=VARCHAR}
+			#{item}
 		</foreach>
 	</delete>