From 07ac1e11672a8e81cc9c28b64583524214267385 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 16 Dec 2022 16:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/system/controller/role/SysRoleController.java    | 2 +-
 .../main/java/org/nl/system/service/param/dao/Param.java    | 2 ++
 .../java/org/nl/system/service/role/ISysRoleService.java    | 2 +-
 .../org/nl/system/service/role/impl/SysRoleServiceImpl.java | 6 +++---
 nladmin-ui/src/main.js                                      | 2 +-
 nladmin-ui/src/views/system/monitor/device/index.vue        | 2 +-
 nladmin-ui/src/views/system/param/index.vue                 | 2 +-
 nladmin-ui/src/{api/system => views/system/param}/param.js  | 0
 nladmin-ui/src/views/system/role/index.vue                  | 1 +
 9 files changed, 11 insertions(+), 8 deletions(-)
 rename nladmin-ui/src/{api/system => views/system/param}/param.js (100%)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
index aaa9972..4f6c09e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
@@ -66,7 +66,7 @@ public class SysRoleController {
     @ApiOperation("删除角色")
     @DeleteMapping
     @SaCheckPermission("roles:del")
-    public ResponseEntity<Object> delete(@RequestBody Set<Long> ids) {
+    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         roleService.deleteBatchByIds(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
index 91b30ca..dcfddaf 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
@@ -1,5 +1,6 @@
 package org.nl.system.service.param.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import lombok.Data;
@@ -23,6 +24,7 @@ public class Param implements Serializable {
     /**
      * 标识
      */
+    @TableId
     private String id;
 
     /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
index aac2ee1..db08267 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
@@ -39,7 +39,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * 删除角色
      * @param ids
      */
-    void deleteBatchByIds(Set<Long> ids);
+    void deleteBatchByIds(Set<String> ids);
 
     /**
      * 更新角色菜单
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
index 12cb18c..f53f086 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * <p>
@@ -109,12 +110,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteBatchByIds(Set<Long> ids) {
+    public void deleteBatchByIds(Set<String> ids) {
         // 删除角色表
         roleMapper.deleteBatchIds(ids);
-
         // 删除角色用户表
-        rolesMenusMapper.deleteBatchIds(ids);
+        ids.forEach(id -> rolesMenusMapper.delete(new LambdaQueryWrapper<SysRolesMenus>().eq(SysRolesMenus::getRoleId, id)));
     }
 
     @Override
diff --git a/nladmin-ui/src/main.js b/nladmin-ui/src/main.js
index 1fe4089..a4b8c91 100644
--- a/nladmin-ui/src/main.js
+++ b/nladmin-ui/src/main.js
@@ -44,7 +44,7 @@ import request from '@/utils/request' // 实现 form generator 使用自己定
 
 import { addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels, flexWidth } from '@/utils/nladmin'
 
-import { getValueByCode } from '@/api/system/param'
+import { getValueByCode } from '@/views/system/param/param'
 
 LogicFlow.use(Menu)
 
diff --git a/nladmin-ui/src/views/system/monitor/device/index.vue b/nladmin-ui/src/views/system/monitor/device/index.vue
index 904947a..1367f72 100644
--- a/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -8,7 +8,7 @@
 
 <script>
 import crudStage from '@/api/logicflow/stage'
-import paramCrud from '@/api/system/param'
+import paramCrud from '@/views/system/param/param'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'
 
diff --git a/nladmin-ui/src/views/system/param/index.vue b/nladmin-ui/src/views/system/param/index.vue
index 22080ab..0225f3b 100644
--- a/nladmin-ui/src/views/system/param/index.vue
+++ b/nladmin-ui/src/views/system/param/index.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import crudParam from '@/api/system/param'
+import crudParam from '@/views/system/param/param'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
diff --git a/nladmin-ui/src/api/system/param.js b/nladmin-ui/src/views/system/param/param.js
similarity index 100%
rename from nladmin-ui/src/api/system/param.js
rename to nladmin-ui/src/views/system/param/param.js
diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue
index 4089c66..dd11dcf 100644
--- a/nladmin-ui/src/views/system/role/index.vue
+++ b/nladmin-ui/src/views/system/role/index.vue
@@ -246,6 +246,7 @@ export default {
       crudRoles.editMenu(role).then(() => {
         this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.menuLoading = false
+        this.crud.toQuery()
         // this.update()
       }).catch(err => {
         this.menuLoading = false