From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 31 一月 2024 09:37:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/company/src/main/java/com/doumee/api/business/CompanyController.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/CompanyController.java b/server/company/src/main/java/com/doumee/api/business/CompanyController.java index 80f978b..5687677 100644 --- a/server/company/src/main/java/com/doumee/api/business/CompanyController.java +++ b/server/company/src/main/java/com/doumee/api/business/CompanyController.java @@ -6,6 +6,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Company; import com.doumee.service.business.CompanyService; import io.swagger.annotations.Api; @@ -20,7 +21,7 @@ /** * @author 姹熻箘韫� - * @date 2024/01/15 15:07 + * @date 2024/01/16 10:03 */ @Api(tags = "浼佷笟淇℃伅琛�") @RestController @@ -35,7 +36,9 @@ @PostMapping("/create") @RequiresPermissions("business:company:create") public ApiResponse create(@RequestBody Company company) { - return ApiResponse.success(companyService.create(company)); + companyService.create(company); + companyService.startSignAuth(company.getId()); + return ApiResponse.success(null); } @ApiOperation("鏍规嵁ID鍒犻櫎") @@ -64,13 +67,14 @@ @RequiresPermissions("business:company:update") public ApiResponse updateById(@RequestBody Company company) { companyService.updateById(company); + companyService.startSignAuth(company.getId()); return ApiResponse.success(null); } - @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") @RequiresPermissions("business:company:query") public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) { + //鏉冮檺鑼冨洿鍐� return ApiResponse.success(companyService.findPage(pageWrap)); } @@ -84,7 +88,8 @@ @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") @RequiresPermissions("business:company:query") - public ApiResponse findById(@PathVariable Integer id) { + public ApiResponse<Company> findById(@PathVariable Integer id) { + return ApiResponse.success(companyService.findById(id)); } } -- Gitblit v1.9.3