From 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 18:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index ec599bc..bb93b7a 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goods;
@@ -48,7 +49,7 @@
@PreventRepeat
@ApiOperation("浼佷笟鏂板缓鍟嗗搧")
@PostMapping("/companyCreate")
- @RequiresPermissions("business:goods:create")
+// @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
return ApiResponse.success(goodsService.companyCreate(goods));
}
@@ -102,6 +103,8 @@
@PostMapping("/page")
@RequiresPermissions("business:goods:query")
public ApiResponse<PageData<Goods>> findPage (@RequestBody PageWrap<Goods> pageWrap) {
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
return ApiResponse.success(goodsService.findPage(pageWrap));
}
--
Gitblit v1.9.3