From 28d47a01097d4b3cfa8e410be2da36ec1036caac Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 13 Oct 2026 04:58:47 -0400 Subject: [PATCH] =?UTF-8?q?--author:scott--date:20261013--for:=E3=80=90?= =?UTF-8?q?=E5=AE=89=E5=85=A8=20GHSA-8v96-whwg-rf92/GHSA-xpvg-j72w-356p/GH?= =?UTF-8?q?SA-3f75-3wg8-c663/GHSA-23w8-29xc-fpfh=E3=80=91=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E6=8B=A5=E6=9C=89=E8=80=85=E5=8F=98=E6=9B=B4=E4=B8=8E?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=E6=A0=A1=E9=AA=8C=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=80=85=E8=BA=AB=E4=BB=BD=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E8=A2=AB=E6=8E=A5=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../modules/system/controller/SysTenantController.java | 10 ++++++++++ .../system/service/impl/SysTenantServiceImpl.java | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index ee8af1a0d..38e4fc72c 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -487,6 +487,16 @@ public class SysTenantController { if(sysTenant==null) { return result.error500("未找到对应实体"); } + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-23w8-29xc-fpfh/GHSA-xpvg-j72w-356p】只有租户拥有者、租户管理员或admin才能编辑,且不允许修改拥有者、状态、删除标记----------- + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!loginUser.getUsername().equals(sysTenant.getCreateBy()) && !SecurityUtils.getSubject().hasRole("admin")) { + // 非当前租户的组织账户管理员或超级管理员时抛出异常 + sysTenantPackService.izHaveManageUserAuth(tenant.getId().toString()); + } + tenant.setCreateBy(null); + tenant.setStatus(null); + tenant.setDelFlag(null); + //update-end---author:scott ---date:20261013 for:【安全 GHSA-23w8-29xc-fpfh/GHSA-xpvg-j72w-356p】只有租户拥有者、租户管理员或admin才能编辑,且不允许修改拥有者、状态、删除标记----------- if(oConvertUtils.isEmpty(sysTenant.getHouseNumber())){ tenant.setHouseNumber(RandomUtil.randomStringUpper(6)); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java index f4ed68a3f..cc651b1d0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java @@ -367,6 +367,12 @@ public class SysTenantServiceImpl extends ServiceImpl