From 8ba1fa2ca00e5cd340194bf8aabc8f8516615eb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:55:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 1cdcdd2..7617064 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -46,8 +46,15 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:member:create")
- public ApiResponse create(@RequestBody Member member) {
- return ApiResponse.success(memberService.create(member));
+ public ApiResponse create(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+ member.setLoginUserInfo(this.getLoginUser(token));
+ Member insert = memberService.create(member);
+ //鍒涘缓浜鸿劯淇℃伅
+ return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
+ }else{
+ return ApiResponse.failed("瀵逛笉璧凤紝鏃犳潈闄愭搷浣滐紒");
+ }
}
@PreventRepeat
@@ -117,7 +124,7 @@
@ApiOperation("鏍规嵁ID 绂佸惎鐢� ")
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateStatusById(@RequestBody Member member){
+ public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateStatusById(member);
return ApiResponse.success(null);
}
@@ -125,7 +132,7 @@
@ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
@PostMapping("/updateRemoveStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
+ public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(list.size()>0){
memberService.updateRemoveStatusById(list);
return ApiResponse.success(null);
@@ -138,7 +145,8 @@
@ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
@PostMapping("/updateVisitsStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member){
+ public ApiResponse updateVisitsStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateVisitsStatusById(member);
return ApiResponse.success(null);
}
@@ -175,7 +183,7 @@
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateCanVisitById(@RequestBody Member member){
+ public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateCanVisitById(member);
return ApiResponse.success(null);
}
@@ -186,11 +194,17 @@
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(memberService.findList(model));
+ }
@ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
@PostMapping("/findLaborMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
+ public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
}
@@ -220,7 +234,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
--
Gitblit v1.9.3