From c2551c7d581cd09f44e6acbaf3f28c9979ddf08c Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 25 Apr 2023 15:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/LinkInterfaceUtil.java              | 16 +++++------
 .../depository_manage/OtherTest.java          | 27 +++++++------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java
index 3ebd53bd..921f3c41 100644
--- a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java
+++ b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java
@@ -143,11 +143,11 @@ public class LinkInterfaceUtil {
      * @return 查询结果
      */
     public static List<AdministrationP> findCompanyBySuperior(String superior, UserByPort userByPort) {
-        String url = PortConfig.external_url + "/org/govlist";
+        String url = PortConfig.external_url + "/org/govthree";
         Map<String, Object> map = new HashMap<>();
-        map.put("superior", superior);
-        map.put("level", 4);
-        map.put("state", 1);
+        map.put("idstr", superior);
+        map.put("level", 0);
+        map.put("all", 1);
         String jsonString = JSONObject.toJSONString(map);
         JSONObject paramObject = JSONObject.parseObject(jsonString);
         String post = null;
@@ -157,15 +157,13 @@ public class LinkInterfaceUtil {
             e.printStackTrace();
         }
         JSONObject jsonObject = JSONObject.parseObject(post);
-        JSONObject data = (JSONObject) jsonObject.get("data");
-        JSONArray list = (JSONArray) data.get("list");
+        JSONArray list = (JSONArray) jsonObject.get("data");
         if (list == null) {
             list = new JSONArray();
         }
-        Integer total = ObjectFormatUtil.toInteger(data.get("total"));
         List<AdministrationP> administrationPList = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            Administration administration = JSONObject.toJavaObject((JSONObject) list.get(i), Administration.class);
+        for (Object o : list) {
+            Administration administration = JSONObject.toJavaObject((JSONObject) o, Administration.class);
             AdministrationP administrationP = new AdministrationP(administration);
             administrationPList.add(administrationP);
         }
diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
index a9a5b977..2ef3a814 100644
--- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
+++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
@@ -1,23 +1,31 @@
 package com.dreamchaser.depository_manage;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.dreamchaser.depository_manage.config.PortConfig;
 import com.dreamchaser.depository_manage.config.QyWx_approval_template.Approval_template_approver;
+import com.dreamchaser.depository_manage.entity.Administration;
 import com.dreamchaser.depository_manage.entity.Depository;
 import com.dreamchaser.depository_manage.entity.MaterialType;
 import com.dreamchaser.depository_manage.entity.UserByPort;
 import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
+import com.dreamchaser.depository_manage.pojo.AdministrationP;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
 import com.dreamchaser.depository_manage.service.*;
 import com.dreamchaser.depository_manage.utils.DateUtil;
+import com.dreamchaser.depository_manage.utils.HttpUtils;
 import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil;
+import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import lombok.Data;
+import org.apache.http.protocol.HTTP;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -45,25 +53,8 @@ public class OtherTest {
 //        approvalInfo.setApprover(approver);
 //        depositoryRecordService.reviewByQyWxApprovalIn("[10, 11]",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240015");
 //        stockTakingService.reviewByQyWxApproval("4",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240042");
-
-        List<Integer> childForDepositoryByParent = findChildForDepositoryByParent(8);
-        System.out.println(childForDepositoryByParent);
     }
 
-    public List<Integer> findChildForDepositoryByParent(Integer did) {
-        List<Integer> result = new ArrayList<>();
-        result.add(did);
-        List<Integer> parentIdList = new ArrayList<>();
-        parentIdList.add(did);
-        List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
-        for (Depository depository : depositoryAll) {
-            Integer id = depository.getId();
-            if (parentIdList.contains(depository.getParentId())) {
-                parentIdList.add(id);
-                result.add(id);
-            }
-        }
-        return result;
-    }
+
 
 }