From 40521d51f8c083212ceb1710ab0bea570821d063 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 09:25:43 +0800
Subject: [PATCH] 平台端调度部门下拉框

---
 ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java |   19 ++++++++++++-------
 1 files changed, 12 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 f3f58e4..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
@@ -312,6 +312,7 @@
                 //鏌ヨ浠昏亴
                 JSONArray jobArr = getStaffAppointment(employeeCode);
                 assert jobArr != null;
+                log.info("浠昏亴----------------->{}",jobArr);
                 //涓存椂淇濆瓨浠昏亴鐨刬ds锛堢郴缁熺殑鐢ㄦ埛浣撶郴锛�
                 List<Long> posIds = new ArrayList<>();
                 //鐢ㄦ埛瑙掕壊code
@@ -323,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("瑙e瘑鍚庣殑orgId-------------->{}",orgId);
                                 empCodeObj.put("orgId", orgId);
-                                empCodeObj.put("orgName", orgName);
-                            }
+//                                empCodeObj.put("orgName", orgName);
+//                            }
                         }
                     }
                     //鑱屼綅淇℃伅
@@ -366,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);
@@ -386,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