From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/StoreStaffApi.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/StoreStaffApi.java b/service-store/src/main/java/com/java110/store/api/StoreStaffApi.java
old mode 100644
new mode 100755
index 950d8e1..35de967
--- a/service-store/src/main/java/com/java110/store/api/StoreStaffApi.java
+++ b/service-store/src/main/java/com/java110/store/api/StoreStaffApi.java
@@ -45,17 +45,24 @@
* @path /app/storeStaff/getPropertyStaffs
*/
@RequestMapping(value = "/getPropertyStaffs", method = RequestMethod.GET)
- public ResponseEntity<String> getPropertyStaffs(@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row,
- @RequestParam(value = "storeId", required = false) String storeId,
- @RequestParam(value = "roleCd", required = false) String roleCd
+ public ResponseEntity<String> getPropertyStaffs(@RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "staffName", required = false) String staffName,
+ @RequestParam(value = "shareId", required = false) String tel,
+ @RequestParam(value = "storeTypeCd", required = false) String storeTypeCd,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "storeId", required = false) String storeId,
+ @RequestParam(value = "relCd", required = false) String relCd
) {
StoreUserDto storeUserDto = new StoreUserDto();
storeUserDto.setPage(page);
storeUserDto.setRow(row);
- storeUserDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
+ storeUserDto.setStoreTypeCd(storeTypeCd);//StoreDto.STORE_TYPE_PROPERTY
storeUserDto.setStoreId(storeId);
- storeUserDto.setRelCd(roleCd);
+ storeUserDto.setRelCd(relCd);
+ storeUserDto.setName(name);
+ storeUserDto.setStaffName(staffName);
+ storeUserDto.setTel(tel);
return getStoreStaffBMOImpl.getStoreStaffs(storeUserDto);
}
--
Gitblit v1.8.0