From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 400adbf..fd9872f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.business.ERPSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +37,9 @@
@Autowired
private CompanyService companyService;
+
+ @Autowired
+ private ERPSyncService erpSyncService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -150,7 +154,7 @@
*/
@ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
@GetMapping("/findCompanyTreePage")
-// @RequiresPermissions("business:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
return ApiResponse.success(companyService.findCompanyTreePage(type));
}
@@ -159,9 +163,9 @@
@ApiOperation("閮ㄩ棬淇℃伅鍚屾")
@PostMapping("/sync")
-// @RequiresPermissions("business:company:sync")
+ @RequiresPermissions("business:company:sync")
public ApiResponse sync(){
- //TODO 鎵嬪姩鍚屾 閮ㄩ棬淇℃伅
+ erpSyncService.syncCompany(null);
return ApiResponse.success("鍚屾鎴愬姛");
}
}
--
Gitblit v1.9.3