Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-15 10e21bbecc87a8f6e30e69daddb4fe9e09888d20

 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("无效操作");