From a1b0e5c618b9cd1c2521be14beec70321232ec1d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 11 十二月 2023 14:27:55 +0800
Subject: [PATCH] 删除注释
---
ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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..0c61fef 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
@@ -308,6 +312,7 @@
//鏌ヨ浠昏亴
JSONArray jobArr = getStaffAppointment(employeeCode);
assert jobArr != null;
+ log.info("浠昏亴----------------->{}",jobArr);
//涓存椂淇濆瓨浠昏亴鐨刬ds锛堢郴缁熺殑鐢ㄦ埛浣撶郴锛�
List<Long> posIds = new ArrayList<>();
//鐢ㄦ埛瑙掕壊code
@@ -319,15 +324,17 @@
if (isMain) {
JSONObject holdapost = jobArr.getJSONObject(0);
String orgCode = holdapost.getString("organizationCode");
+ log.info("orgCode---------------->{}",orgCode);
if (StrUtil.isNotBlank(orgCode)) {
- JSONObject orgDetail = getOrgDetailByCode(orgCode);
- if (null != orgDetail) {
- String orgId = orgDetail.getString("organizationCode");
- String orgName = orgDetail.getString("organizationName");
- orgId = DingEncodeUtil.getMD5(orgId.getBytes());
+// JSONObject orgDetail = getOrgDetailByCode(orgCode);
+// if (null != orgDetail) {
+// String orgId = orgDetail.getString("organizationCode");
+// String orgName = orgDetail.getString("organizationName");
+ Long orgId = Long.parseLong(DingEncodeUtil.getMD5(orgCode.getBytes()));
+ log.info("瑙ｅ瘑鍚庣殑orgId-------------->{}",orgId);
empCodeObj.put("orgId", orgId);
- empCodeObj.put("orgName", orgName);
- }
+// empCodeObj.put("orgName", orgName);
+// }
}
}
//鑱屼綅淇℃伅
@@ -362,6 +369,7 @@
//杞崲涓哄疄浣撶被
DingUserInfo dingUserInfo = BeanUtil.toBean(empCodeObj, DingUserInfo.class);
Long orgId = dingUserInfo.getOrgId();
+ log.info("鏈�鍚庣粨鏋滅殑orgId----------->{}",orgId);
if (ObjectUtil.isNotEmpty(orgId)) {
dingUserInfo.setPosIdList(posIds);
dingUserInfo.setRoleCodeList(roleCodeList);
@@ -382,6 +390,7 @@
postClient.addParameter("employeeCode", empCode);
String apiResult = postClient.post();
JSONObject dataObj = parsingJson(apiResult);
+ log.info("浠昏亴------------->{}",dataObj);
if (null != dataObj) {
return dataObj.getJSONArray("data");
}
--
Gitblit v1.8.0