From abf019e0146c1809a0d50f38ce326cee4e9ee25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 6 Jun 2023 15:05:35 +0800 Subject: [PATCH] 'commit' --- src/main/java/UnitTest/TestDingTalk.java | 9 +++++++-- .../java/com/dsideal/FengHuang/Util/DingTalkUtil.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/UnitTest/TestDingTalk.java b/src/main/java/UnitTest/TestDingTalk.java index c3e4605..bcc7c9b 100644 --- a/src/main/java/UnitTest/TestDingTalk.java +++ b/src/main/java/UnitTest/TestDingTalk.java @@ -63,13 +63,18 @@ public class TestDingTalk { //AccessToken String accessToken = DingTalkUtil.getAccessToken(appKey, appSecret); //查询钉钉中有哪些部门 - int orgId = DingTalkUtil.getOrgIdByOrgName("长春市东光学校"); + String orgName = "长春市东光学校"; + int orgId = DingTalkUtil.getOrgIdByOrgName(orgName); //获取部门信息 DingTalkUtil.deptList.clear(); long dept_id = DingTalkUtil.getDtDeptId(orgId); DingTalkUtil.getDeptList(accessToken, dept_id); + if (DingTalkUtil.deptList.size() == 0) { + DingTalkUtil.createDept(accessToken, orgName, 1, 1); + } + // 云平台->集合A,钉钉->集合B // (1) x在A中存在,在B中也存在,内容也一致:不处理 // (2) x在A中存在,在B中也存在,内容不一致:更新处理 @@ -113,7 +118,7 @@ public class TestDingTalk { DingTalkUtil.delDept(accessToken, key); } else { // key在A和B中都存在 - DingTalkUtil.updateDept(accessToken,key,mapOfB.get(key).getString("org_name"),mapOfB.get(key).getInteger("sort_id")); + DingTalkUtil.updateDept(accessToken, key, mapOfB.get(key).getString("org_name"), mapOfB.get(key).getInteger("sort_id")); } } //在B不在A diff --git a/src/main/java/com/dsideal/FengHuang/Util/DingTalkUtil.java b/src/main/java/com/dsideal/FengHuang/Util/DingTalkUtil.java index 57da64b..6f887a2 100644 --- a/src/main/java/com/dsideal/FengHuang/Util/DingTalkUtil.java +++ b/src/main/java/com/dsideal/FengHuang/Util/DingTalkUtil.java @@ -236,7 +236,7 @@ public class DingTalkUtil { OapiV2DepartmentListsubResponse rsp = client.execute(req, access_token); JSONObject jo = JSONObject.parseObject(rsp.getBody()); JSONArray ja = jo.getJSONArray("result"); - + if (ja == null) return; for (int i = 0; i < ja.size(); i++) { JSONObject j = ja.getJSONObject(i); Kv kv = Kv.create();