From ad86a0aa39f20e1b8bb511acd6961c7ec59f9251 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 13 十二月 2024 17:15:51 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java index 94d7245..beec7ca 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java @@ -1,6 +1,5 @@ package com.doumee.api.business; -import com.doumee.api.BaseController; import com.doumee.config.DataSyncConfig; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; @@ -27,6 +26,7 @@ import java.util.ArrayList; import java.util.List; +import com.doumee.api.BaseController; /** * @author 姹熻箘韫� * @date 2023/11/30 15:33 @@ -66,7 +66,7 @@ @GetMapping("/delete/{id}") @RequiresPermissions("business:company:delete") public ApiResponse deleteById(@PathVariable Integer id) { - companyService.deleteById(id); + companyService.deleteById(id,this.getLoginUser(null)); return ApiResponse.success(null); } @@ -79,7 +79,7 @@ for (String id : idArray) { idList.add(Integer.valueOf(id)); } - companyService.deleteByIdInBatch(idList); + companyService.deleteByIdInBatch(idList,this.getLoginUser(null)); return ApiResponse.success(null); } @@ -101,7 +101,7 @@ @ApiOperation("缁勭粐鏍戞煡璇�") @GetMapping("/tree") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true), + @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true) }) @RequiresPermissions("business:company:query") public ApiResponse<List<Company>> tree (@RequestParam Integer type) { @@ -173,7 +173,11 @@ 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(null)); + return ApiResponse.success("鍚屾鎴愬姛"); + }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){ + //濡傛灉鏄嚜寤虹郴绲憋紝鍚屾瀹夐槻骞冲彴鍒濆鍖栨暟鎹� + hkSyncOrgUserFHKService.syncOrgData(this.getLoginUser(null)); return ApiResponse.success("鍚屾鎴愬姛"); } return ApiResponse.failed("鏃犳晥鎿嶄綔"); -- Gitblit v1.9.3