From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 39f5e8b..7343cc6 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
@@ -23,6 +23,7 @@
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,8 @@
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
+ @Autowired
+ private HkSyncOrgUserFromSelfServiceImpl hkSyncOrgUserFromSelfService;
@Autowired
private DataSyncConfig dataSyncConfig;
@@ -321,11 +324,14 @@
@ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
@PostMapping("/syncAll")
@CloudRequiredPermission("business:member:sync")
- public ApiResponse sync(){
+ public ApiResponse sync(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
erpSyncService.syncUsers(null);
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncUserData();
+ hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(token));
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+ hkSyncOrgUserFromSelfService.syncUserData(this.getLoginUser(token));
+ return ApiResponse.success("鍚屾鎴愬姛");
}
return ApiResponse.success("鍚屾鎴愬姛");
}
--
Gitblit v1.9.3