From d2b38b648d976080ccd1b8cf6d2f3040f12fd026 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 31 十月 2024 09:46:46 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 19 +++++++++++++++++-- 1 files changed, 17 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..ec0beda 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; @@ -99,6 +102,15 @@ public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ return ApiResponse.success(companyService.findPage(pageWrap)); } + + @ApiOperation("缁勭粐鍒楄〃") + @PostMapping("/list") + @CloudRequiredPermission("business:company:query") + public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + return ApiResponse.success(companyService.findList(company)); + } + + @ApiOperation("缁勭粐鏍戞煡璇�") @GetMapping("/tree") @@ -171,11 +183,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