From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 02 二月 2024 17:26:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/company/src/main/java/com/doumee/api/business/NoticesController.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/NoticesController.java b/server/company/src/main/java/com/doumee/api/business/NoticesController.java index 398a78a..42f845b 100644 --- a/server/company/src/main/java/com/doumee/api/business/NoticesController.java +++ b/server/company/src/main/java/com/doumee/api/business/NoticesController.java @@ -4,13 +4,16 @@ import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.model.ApiResponse; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Notices; import com.doumee.service.business.NoticesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -20,7 +23,7 @@ /** * @author 姹熻箘韫� - * @date 2024/01/15 15:07 + * @date 2024/01/16 10:03 */ @Api(tags = "绯荤粺娑堟伅淇℃伅琛�") @RestController @@ -71,6 +74,9 @@ @PostMapping("/page") @RequiresPermissions("business:notices:query") public ApiResponse<PageData<Notices>> findPage (@RequestBody PageWrap<Notices> pageWrap) { + LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId()); + pageWrap.getModel().setPalt(Constants.ONE); return ApiResponse.success(noticesService.findPage(pageWrap)); } -- Gitblit v1.9.3