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);