From 70b3a96d6b4079508ee7bb5b9541b9d156c0ede5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 30 三月 2023 15:04:49 +0800
Subject: [PATCH] 优化员工列表查询
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java | 2 ++
4 files changed, 9 insertions(+), 1 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 7bc4cb5..b96afca 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
@@ -15,6 +15,10 @@
private String updateTime;
/**鍛樺伐浼佷笟userId*/
private String userId;
+ /**瑙掕壊鍞竴瀛楃涓�*/
+ private String uniqueStr;
+ /**棰勭害闂ㄥ簵鏍囪瘑*/
+ private String shopId;
/**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
private List<String> roleList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
index 471445d..9db529b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
@@ -21,4 +21,6 @@
private String roleId;
/**瑙掕壊琛ㄦ爣璇�*/
private String roleTypeId;
+ /**鏄惁鍚岄棬搴�*/
+ private Integer isSameShop;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 9e9e894..aaf032b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -19,6 +19,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鎵�灞為【闂爣璇�*/
+ private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
private String beCorpUser;
/**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
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 4bdf4f6..270b09c 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
@@ -64,7 +64,7 @@
@PostMapping(value = "/emp/role/liset")
Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);
- /**鍛樺伐-瑙掕壊鍒楄〃*/
+ /**鑾峰彇鍛樺伐-瑙掕壊鍒楄〃*/
@PostMapping(value = "/emp/role/info/list")
Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
--
Gitblit v1.8.0