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 delete(@RequestBody Set ids) { + public ResponseEntity delete(@RequestBody Set 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 { * 删除角色 * @param ids */ - void deleteBatchByIds(Set ids); + void deleteBatchByIds(Set 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; /** *

@@ -109,12 +110,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public void deleteBatchByIds(Set ids) { + public void deleteBatchByIds(Set ids) { // 删除角色表 roleMapper.deleteBatchIds(ids); - // 删除角色用户表 - rolesMenusMapper.deleteBatchIds(ids); + ids.forEach(id -> rolesMenusMapper.delete(new LambdaQueryWrapper().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 @@