From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
index fd00a02..f3f58e4 100644
--- a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
+++ b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
@@ -15,6 +15,7 @@
import com.alibaba.xxpt.gateway.shared.api.response.OapiMoziOrganizationPageSubOrganizationCodesResponse;
import com.alibaba.xxpt.gateway.shared.client.http.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ycl.config.DingConfig;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dingding.DingUserInfo;
@@ -189,6 +190,9 @@
*/
public List<UmsDepart> getOrgInfo(JSONArray deptTopArr) {
List<UmsDepart> orgList = new ArrayList<>();
+ if(CollectionUtils.isEmpty(deptTopArr)){
+ return null;
+ }
//鑾峰彇鍏ㄩ儴閮ㄩ棬code
//JSONObject topObj = getBookAuthority();
//椤剁骇閮ㄩ棬id
--
Gitblit v1.8.0