From 18124943ceda736ca23026694b280cf3cbde39ff Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 13 Oct 2026 04:13:46 -0400 Subject: [PATCH] =?UTF-8?q?--author:scott--date:20261013--for:=E3=80=90?= =?UTF-8?q?=E5=AE=89=E5=85=A8=20GHSA-pjwf-2w2c-xc23/GHSA-4w9p-7gw3-q7v4?= =?UTF-8?q?=E3=80=91batchEditUsers=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=88=96=E5=BD=93=E5=89=8D=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=94=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=94=B9=E6=9C=AC=E7=A7=9F=E6=88=B7=E7=94=A8=E6=88=B7=EF=BC=9B?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5=E8=A1=A5?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../controller/SysRoleIndexController.java | 1 + .../system/controller/SysUserController.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java index 5ecfb5cf3..460da31af 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java @@ -183,6 +183,7 @@ public class SysRoleIndexController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, SysRoleIndex.class); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 03623de3c..d8a9afb1f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -109,6 +109,9 @@ public class SysUserController { @Autowired private ISysUserTenantService userTenantService; + @Autowired + private ISysTenantPackService sysTenantPackService; + @Autowired private JeecgRedisClient jeecgRedisClient; @Autowired @@ -1954,6 +1957,21 @@ public class SysUserController { */ @PutMapping("/batchEditUsers") public Result batchEditUsers(@RequestBody JSONObject jsonObject) { + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-pjwf-2w2c-xc23/GHSA-4w9p-7gw3-q7v4】批量修改用户部门职位须为用户管理员或当前租户管理员,且租户管理员只能修改本租户用户----------- + if (!SecurityUtils.getSubject().hasRole("admin") && !SecurityUtils.getSubject().isPermitted("system:user:edit")) { + String tenantId = TenantContext.getTenant(); + if (oConvertUtils.isEmpty(tenantId)) { + return Result.error("无权限执行此操作"); + } + // 非当前租户的组织账户管理员或超级管理员时抛出异常 + sysTenantPackService.izHaveManageUserAuth(tenantId); + List idList = JSONArray.parseArray(jsonObject.getString("userIds"), String.class); + List tenantUserIds = userTenantService.getUserIdsByTenantId(Integer.valueOf(tenantId)); + if (idList == null || !tenantUserIds.containsAll(idList)) { + return Result.error("只能修改当前租户下的用户"); + } + } + //update-end---author:scott ---date:20261013 for:【安全 GHSA-pjwf-2w2c-xc23/GHSA-4w9p-7gw3-q7v4】批量修改用户部门职位须为用户管理员或当前租户管理员,且租户管理员只能修改本租户用户----------- Result result = new Result(); try { sysUserService.batchEditUsers(jsonObject);