From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 c5f8ca7..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;
@@ -43,6 +44,8 @@
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@Autowired
+ private HkSyncOrgUserFromSelfServiceImpl hkSyncOrgUserFromSelfService;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@PreventRepeat
@@ -58,7 +61,7 @@
@ApiOperation("鍒涘缓鍔冲姟鍏徃")
@PostMapping("/createLaborServices")
@CloudRequiredPermission("business:company:create")
- public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<Integer> createLaborServices(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
company.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(companyService.createLaborServices(company));
}
@@ -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