From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:51:52 +0800
Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的…
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
index a474ed3..d4a9dc8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
@@ -79,6 +79,7 @@
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody SysRoleBo role) {
+ roleService.checkRoleAllowed(role);
if (!roleService.checkRoleNameUnique(role)) {
return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
} else if (!roleService.checkRoleKeyUnique(role)) {
@@ -148,11 +149,13 @@
/**
* 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
+ *
+ * @param roleIds 瑙掕壊ID涓�
*/
@SaCheckPermission("system:role:query")
@GetMapping("/optionselect")
- public R<List<SysRoleVo>> optionselect() {
- return R.ok(roleService.selectRoleAll());
+ public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
+ return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds)));
}
/**
--
Gitblit v1.9.3