From 0aa2dd71fa4b989838f89aff2cac82950a70097f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 22 八月 2024 18:10:48 +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/CompanyCloudController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index 7785c41..464f2bd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -15,6 +15,7 @@
import com.doumee.service.business.CompanyService;
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.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -42,6 +43,8 @@
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
+ @Autowired
+ private HkSyncOrgUserFromSelfServiceImpl hkSyncOrgUserFromSelfService;
@Autowired
private DataSyncConfig dataSyncConfig;
@@ -171,11 +174,14 @@
@ApiOperation("鍏ㄩ噺閮ㄩ棬淇℃伅鍚屾")
@PostMapping("/syncAll")
@CloudRequiredPermission("business:company:sync")
- public ApiResponse sync(){
+ public ApiResponse sync(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
return ApiResponse.success( erpSyncService.syncCompany(null));
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncOrgData();
+ hkSyncOrgUserFHKService.syncOrgData(this.getLoginUser(token));
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+ hkSyncOrgUserFromSelfService.syncOrgData(this.getLoginUser(token));
return ApiResponse.success("鍚屾鎴愬姛");
}
return ApiResponse.failed("鏃犳晥鎿嶄綔");
--
Gitblit v1.9.3