From e1c8f00bf2a2e0edddbaa8119afe1dc92d9dc1d2 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 15 Dec 2025 17:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=A5=E9=87=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E3=80=91=E7=94=A8=E6=88=B7=E5=8F=AF=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E4=BB=BB=E6=84=8F=E7=A7=9F=E6=88=B7=20#9196=20jeecgbo?= =?UTF-8?q?ot=E6=A8=A1=E5=BC=8F=E7=9A=84=E7=A7=9F=E6=88=B7=E6=9C=AA?= =?UTF-8?q?=E5=81=9A=E7=94=B3=E8=AF=B7=E5=8A=A0=E5=85=A5=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=89=B9=E9=80=BB=E8=BE=91=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E8=BF=99=E4=BF=A9=E6=8E=A5=E5=8F=A3=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysTenantController.java | 115 +++++++++--------- 1 file changed, 58 insertions(+), 57 deletions(-) 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 e9580e4e0..a725e858f 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 @@ -507,26 +507,26 @@ public class SysTenantController { return result; } - /** - * 加入租户通过门牌号【低代码应用专用接口】 - * @param sysTenant - */ - @PostMapping("/joinTenantByHouseNumber") - public Result joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){ - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId()); - Result result = new Result<>(); - if(tenantId != 0){ - result.setMessage("申请加入组织成功"); - result.setSuccess(true); - result.setResult(tenantId); - return result; - }else{ - result.setMessage("该门牌号不存在"); - result.setSuccess(false); - return result; - } - } +// /** +// * 加入租户通过门牌号【低代码应用专用接口】 +// * @param sysTenant +// */ +// @PostMapping("/joinTenantByHouseNumber") +// public Result joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){ +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId()); +// Result result = new Result<>(); +// if(tenantId != 0){ +// result.setMessage("申请加入组织成功"); +// result.setSuccess(true); +// result.setResult(tenantId); +// return result; +// }else{ +// result.setMessage("该门牌号不存在"); +// result.setSuccess(false); +// return result; +// } +// } /** * 分页获取租户用户数据(vue3用户租户页面)【低代码应用专用接口】 @@ -713,6 +713,7 @@ public class SysTenantController { * @return */ @PostMapping("/invitationUser") + @RequiresPermissions("system:tenant:invitation:user") public Result invitationUser(@RequestParam(name="phone") String phone, @RequestParam(name="departId",defaultValue = "") String departId){ return sysTenantService.invitationUser(phone,departId); @@ -911,43 +912,43 @@ public class SysTenantController { return Result.ok(pageList); } - /** - * 同意或拒绝加入租户 - */ - @PutMapping("/agreeOrRefuseJoinTenant") - public Result agreeOrRefuseJoinTenant(@RequestParam("tenantId") Integer tenantId, - @RequestParam("status") String status){ - //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String userId = sysUser.getId(); - SysTenant tenant = sysTenantService.getById(tenantId); - if(null == tenant){ - return Result.error("不存在该组织"); - } - SysUserTenant sysUserTenant = relationService.getUserTenantByTenantId(userId, tenantId); - if (null == sysUserTenant) { - return Result.error("该用户不存在该组织中，无权修改"); - } - String content = ""; - SysUser user = new SysUser(); - user.setUsername(sysUserTenant.getCreateBy()); - String realname = oConvertUtils.getString(sysUser.getRealname(),sysUser.getUsername()); - //成功加入 - if(CommonConstant.USER_TENANT_NORMAL.equals(status)){ - //修改租户状态 - relationService.agreeJoinTenant(userId,tenantId); - content = content + realname + "已同意您发送的加入 " + tenant.getName() + " 的邀请"; - sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content); - return Result.OK("您已同意该组织的邀请"); - }else if(CommonConstant.USER_TENANT_REFUSE.equals(status)){ - //直接删除关系表即可 - relationService.refuseJoinTenant(userId,tenantId); - content = content + realname + "拒绝了您发送的加入 " + tenant.getName() + " 的邀请"; - sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content); - return Result.OK("您已成功拒绝该组织的邀请"); - } - return Result.error("类型不匹配，禁止修改数据"); - } +// /** +// * 同意或拒绝加入租户 +// */ +// @PutMapping("/agreeOrRefuseJoinTenant") +// public Result agreeOrRefuseJoinTenant(@RequestParam("tenantId") Integer tenantId, +// @RequestParam("status") String status){ +// //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String userId = sysUser.getId(); +// SysTenant tenant = sysTenantService.getById(tenantId); +// if(null == tenant){ +// return Result.error("不存在该组织"); +// } +// SysUserTenant sysUserTenant = relationService.getUserTenantByTenantId(userId, tenantId); +// if (null == sysUserTenant) { +// return Result.error("该用户不存在该组织中，无权修改"); +// } +// String content = ""; +// SysUser user = new SysUser(); +// user.setUsername(sysUserTenant.getCreateBy()); +// String realname = oConvertUtils.getString(sysUser.getRealname(),sysUser.getUsername()); +// //成功加入 +// if(CommonConstant.USER_TENANT_NORMAL.equals(status)){ +// //修改租户状态 +// relationService.agreeJoinTenant(userId,tenantId); +// content = content + realname + "已同意您发送的加入 " + tenant.getName() + " 的邀请"; +// sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content); +// return Result.OK("您已同意该组织的邀请"); +// }else if(CommonConstant.USER_TENANT_REFUSE.equals(status)){ +// //直接删除关系表即可 +// relationService.refuseJoinTenant(userId,tenantId); +// content = content + realname + "拒绝了您发送的加入 " + tenant.getName() + " 的邀请"; +// sysTenantService.sendMsgForAgreeAndRefuseJoin(user, content); +// return Result.OK("您已成功拒绝该组织的邀请"); +// } +// return Result.error("类型不匹配，禁止修改数据"); +// } /** * 目前只给敲敲云租户下删除用户使用