From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 14 九月 2023 16:52:01 +0800 Subject: [PATCH] 解决冲突 --- server/company/src/main/java/com/doumee/api/business/GoodsController.java | 3 +++ 1 files changed, 3 insertions(+), 0 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..2db1ee9 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; @@ -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