From c767f094fca57fd5a0effa03f2f9a0962c48aab9 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 6 Nov 2021 19:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=83=A8=E9=97=A8=E4=B8=8B?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=94=A8=E6=88=B7=E5=88=86=E9=85=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=8A=A5=E9=94=99(=E6=97=A0=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysDepartRoleController.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
index 3c3abf37..4ac0f2ca 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
@@ -205,7 +205,10 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
 		 List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId));
 		 List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
 		 //根据角色id,用户id查询已授权角色
-		 List<SysDepartRoleUser> roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds));
+		 List<SysDepartRoleUser> roleUserList = null;
+		 if(roleIds!=null && roleIds.size()>0){
+			 roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds));
+		 }
 		 result.setSuccess(true);
 		 result.setResult(roleUserList);
 		 return result;