From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 9bf9172..61231e3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -27,6 +27,13 @@
     Result getEmpDetail(@RequestParam("empId") String empId);
 
     /**
+     * 鑾峰彇鍛樺伐璇︽儏
+     * @return Result
+     */
+    @PostMapping(value = "/emp/detail/byNoOrId")
+    Result getEmpDetailByIdOrNo(@RequestBody EmployeeDto employeeDto);
+
+    /**
      * 鏌ヨ鍛樺伐鍒楄〃
      */
     @PostMapping(value = "/emp/page/list")
@@ -75,6 +82,9 @@
     @PostMapping(value = "/emp/detail/name")
     Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
 
+    @PostMapping(value = "/emp/role/get/one")
+    Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
     @PostMapping(value = "/emp/auth/check")
     Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);
 

--
Gitblit v1.8.0