From eaf3bec9a8850378263ae37b6a0488048de57be3 Mon Sep 17 00:00:00 2001
From: liyuqian <201963020@qq.com>
Date: 星期一, 29 八月 2022 17:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index f0aa39c..7bc4cb5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @author fwq
* 鍛樺伐鎵╁睍
@@ -11,4 +13,8 @@
public class EmployeeDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
+ /**鍛樺伐浼佷笟userId*/
+ private String userId;
+ /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
+ private List<String> roleList;
}
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 3e16eff..9462bd1 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
@@ -53,4 +53,11 @@
*/
@PostMapping(value = "/emp/medical/info")
Result getEmpMedicalInfo(@RequestBody(required = false) String empId);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪浼佷笟userId,鏄惁瀛樺湪浼犻�掔殑瑙掕壊
+ */
+ @PostMapping(value = "/emp/userId/role/check")
+ Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);
+
}
--
Gitblit v1.8.0