From 4fc8f1c0cc9c9b7d2ef120b10718e36de6ea2ba3 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 2 Feb 2024 10:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96HR=E9=83=A8=E9=97=A8=E5=92=8C?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/open/controller/OpenController.java    | 14 +++++++
 .../java/com/op/open/service/OpenService.java |  4 ++
 .../op/open/service/impl/OpenServiceImpl.java | 37 +++++++++++++++++--
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
index d86bb25e..55a12a63 100644
--- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
+++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
@@ -159,5 +159,19 @@ public class OpenController extends BaseController {
         return openService.GetHrUserInfo(dateTime);
     }
 
+    /**
+     * 获取组织架构信息
+     * @return
+     */
+    @GetMapping("/GetHrDeptInfo")
+    public AjaxResult GetHrDeptInfo() {
+        return openService.GetHrDeptInfo();
+    }
+
+
+    @GetMapping("/GetHrPostInfo")
+    public AjaxResult GetHrPostInfo() {
+        return openService.GetHrPostInfo();
+    }
 
 }
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
index 18fcd985..fc1b6dcb 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
@@ -34,4 +34,8 @@ public interface OpenService {
     AjaxResult GetOaNodeInfo(String requestId);
 
     AjaxResult GetHrUserInfo(String dateTime);
+
+    AjaxResult GetHrDeptInfo();
+
+    AjaxResult GetHrPostInfo();
 }
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index a6c055a7..00aae8e0 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -75,8 +75,14 @@ public class OpenServiceImpl implements OpenService {
     @Value("${OA.getnodeInfo}")
     private String getnodeInfo;
 
-    @Value("${HR.url}")
-    private String hr_url;
+    @Value("${HR.url_user}")
+    private String url_user;
+
+    @Value("${HR.url_dept}")
+    private String url_dept;
+
+    @Value("${HR.url_post}")
+    private String url_post;
 
     @Autowired
     private OpenMapper openMapper;
@@ -466,11 +472,36 @@ public class OpenServiceImpl implements OpenService {
         try {
             StringBuilder postDataBuilder = new StringBuilder();
             postDataBuilder.append("createTime=").append("dateTime");
-            String result = HttpUtils.sendPost("http://lj.lanju.cn:8801/outside/api/mes/getUserList.do",postDataBuilder.toString());
+            String result = HttpUtils.sendPost(url_user,postDataBuilder.toString());
             return success(result);
         } catch (Exception e) {
             e.printStackTrace();
             return error(e.getMessage());
         }
     }
+
+    @Override
+    public AjaxResult GetHrDeptInfo() {
+        try {
+            String result = HttpUtils.sendPost(url_dept,null);
+            JSONArray jsonArray=JSONArray.parseArray(result);
+            return success("获取成功",jsonArray);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(e.getMessage());
+        }
+    }
+
+
+    @Override
+    public AjaxResult GetHrPostInfo() {
+        try {
+            String result = HttpUtils.sendPost(url_post,null);
+            JSONArray jsonArray=JSONArray.parseArray(result);
+            return success("获取成功",jsonArray);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(e.getMessage());
+        }
+    }
 }