diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa00ffab..e2d09724 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,5 +3,6 @@
+
\ No newline at end of file
diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java
index b4d396e4..0381259e 100644
--- a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java
+++ b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java
@@ -1,6 +1,20 @@
package com.dreamchaser.depository_manage.config;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.dreamchaser.depository_manage.controller.PageController;
+import com.dreamchaser.depository_manage.entity.Administration;
+import com.dreamchaser.depository_manage.entity.Post;
+import com.dreamchaser.depository_manage.entity.UserByPort;
+import com.dreamchaser.depository_manage.utils.HttpUtils;
import lombok.Data;
+import org.apache.http.protocol.HTTP;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 用于
@@ -13,4 +27,45 @@ public class PortConfig {
public static String external_url_6666 = "http://172.20.2.87:6666";
// public static String external_url_6666 = "http://127.0.0.1:6666";
+ /**
+ * 获取相应部门的部门负责人
+ * @param administration
+ * @return
+ */
+ public static List findDepartmentHeadByUser(Administration administration){
+ String url = PortConfig.external_url + "/org/positionlist";
+ Integer maindeparment = administration.getId();
+ Map map = new HashMap<>();
+ map.put("organization",maindeparment.toString());
+ map.put("incharge",1);
+ String jsonString = JSONObject.toJSONString(map);
+ JSONObject paramObject = JSONObject.parseObject(jsonString);
+ String post = null;
+ try {
+ post = HttpUtils.send(url, paramObject, HTTP.UTF_8);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ JSONObject jsonObject = JSONObject.parseObject(post);
+ JSONObject data = (JSONObject) jsonObject.get("data");
+ JSONArray list = (JSONArray) data.get("list");
+ if(list == null){
+ list = new JSONArray();
+ }
+ List userPostList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ Post userPost = JSONObject.toJavaObject((JSONObject) list.get(i), Post.class);
+ userPostList.add(userPost);
+ }
+ List userByPortList = new ArrayList<>();
+ for (int i = 0; i < userPostList.size(); i++) {
+ Map param = new HashMap<>();
+ Post userPost = userPostList.get(i);
+ param.put("position",userPost.getId());
+ List userByPorts = PageController.FindUserByMap(param);
+ userByPortList.addAll(userByPorts);
+ }
+ return userByPortList;
+ }
+
}
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
index ee78a5e6..94972109 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -121,7 +121,7 @@ public class DepositoryRecordController {
List