From c93c4d7b491ce0e1387ca82c5de39c82714355f5 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 6 Aug 2025 17:02:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=9F=A5=E7=9C=8B=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=8C=83=E5=9B=B4=E4=BF=AE=E6=AD=A3=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E6=9E=90=E9=A1=B5=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderSupStatisticsController.java | 7 +++++++ .../imes/module/system/dal/mysql/user/AdminUserMapper.java | 4 ++++ .../module/system/validation/menu/MenuSourceTypeValid.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java index fbfab7c49..1ec1ebf81 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java @@ -9,6 +9,7 @@ import com.cf.imes.module.system.api.user.AdminUserApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,24 +40,28 @@ public class OrderSupStatisticsController { @GetMapping("/total/org") @Operation(summary = "组织总数") + @PreAuthorize("@ss.hasPermission('homePage:analysis:org-statistic')") public CommonResult> getOrgTotal() { return success(organApi.getOrgTotal().getData()); } @GetMapping("/total/user") @Operation(summary = "用户总数") + @PreAuthorize("@ss.hasPermission('homePage:analysis:org-statistic')") public CommonResult> getUserTotal() { return success(adminUserApi.getUserTotal().getData()); } @GetMapping("/total/userAct") @Operation(summary = "用户活跃数") + @PreAuthorize("@ss.hasPermission('homePage:analysis:org-statistic')") public CommonResult> getUserActTotal() { return success(adminUserApi.getUserActTotal().getData()); } @GetMapping("/total/order") @Operation(summary = "生产单总数") + @PreAuthorize("@ss.hasPermission('homePage:analysis:org-statistic')") public CommonResult> getOrderTotal() { return success(orderSupStatisticsService.orderTotal()); } @@ -69,12 +74,14 @@ public class OrderSupStatisticsController { @GetMapping("/separate/order") @Operation(summary = "有效、无效生产单数量统计") + @PreAuthorize("@ss.hasPermission('homePage:analysis:order-count')") public CommonResult> getOrderSeparate(@Valid OrderStatisticsReqVO reqVO) { return success(orderSupStatisticsService.orderSeparate(reqVO)); } @GetMapping("/separate/org") @Operation(summary = "新增、注销组织数量统计") + @PreAuthorize("@ss.hasPermission('homePage:analysis:org-count')") public CommonResult> getOrgSeparate(@Valid OrgStatisticsReqDTO reqVO) { return organApi.getOrgSeparate(reqVO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java index 5d0a57bea..e2dd039ed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java @@ -72,7 +72,11 @@ public interface AdminUserMapper extends BaseMapperX { assert loginUser != null; if (SecurityFrameworkUtils.isCfOrg()) { if (!Objects.isNull(reqVO.getOrganId())) { + // 管理端晨丰组织看全部组织下的 lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, reqVO.getOrganId()); + } else if(!SecurityFrameworkUtils.isManageEndPoint()){ + // 生产端晨丰组织只看晨丰组织下的 + lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); } } else { lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/menu/MenuSourceTypeValid.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/menu/MenuSourceTypeValid.java index c01f00716..33cb5916f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/menu/MenuSourceTypeValid.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/menu/MenuSourceTypeValid.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; validatedBy = {MenuSourceTypeValidator.class} ) public @interface MenuSourceTypeValid { - String message() default "菜单类型不合法"; + String message() default "菜单来源类型不合法"; Class[] groups() default {};