From 1b95f852d2aed044cc28e72f23fecb4da1994e0c Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 20 九月 2022 16:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v10-20220422' into framework-v11-20220919
---
src/main/java/com/ots/project/system/role/controller/RoleController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ots/project/system/role/controller/RoleController.java b/src/main/java/com/ots/project/system/role/controller/RoleController.java
index 4c14095..0da24fc 100644
--- a/src/main/java/com/ots/project/system/role/controller/RoleController.java
+++ b/src/main/java/com/ots/project/system/role/controller/RoleController.java
@@ -182,6 +182,7 @@
@ResponseBody
public TableDataInfo unallocatedList(User user) {
startPage();
+ //鏌ヨ鍙垎閰嶇敤鎴�
List<User> list = userService.selectUnallocatedList(user);
return getDataTable(list);
}
@@ -190,6 +191,7 @@
@PostMapping("/authUser/selectAll")
@ResponseBody
public AjaxResult selectAuthUserAll(Long roleId, String userIds) {
+ //鍒嗛厤鐢ㄦ埛
return toAjax(roleService.insertAuthUsers(roleId, userIds));
}
}
--
Gitblit v1.9.1