Explorar o código

修復用户查询方法,增加判空

fangq %!s(int64=4) %!d(string=hai) anos
pai
achega
db4f80c07b

+ 9 - 7
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -608,14 +608,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public List<User> getUsersByDeptIdsRoleIds(List<String> deptIds, List<String> roleIds) {
 
 		List<User> list = baseMapper.getUsersByDeptIdsRoleIds(deptIds, roleIds);
-		roleIds.forEach(ids -> {
-			List<User> usersByRoleId = getUsersByRoleId(ids);
-			usersByRoleId.forEach(item -> {
-				if (!isUserInList(item.getId(), list) && deptIds.contains(item.getDeptId())){
-					list.add(item);
-				}
+		if (roleIds != null){
+			roleIds.forEach(ids -> {
+				List<User> usersByRoleId = getUsersByRoleId(ids);
+				usersByRoleId.forEach(item -> {
+					if (!isUserInList(item.getId(), list) && deptIds != null && deptIds.contains(item.getDeptId())){
+						list.add(item);
+					}
+				});
 			});
-		});
+		}
 
 		return list;
 	}