From b970af00c127646b39dbe2936613a8285422476d Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Mon, 10 Apr 2023 21:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=94=A8=E6=88=B7=E4=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E9=85=8D=E8=A7=92=E8=89=B2=20#454?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysUserController.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 9e601f95..15780082 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1013,7 +1013,7 @@ public class SysUserController { user.setStatus(CommonConstant.USER_UNFREEZE); user.setDelFlag(CommonConstant.DEL_FLAG_0); user.setActivitiSync(CommonConstant.ACT_SYNC_0); - sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test + sysUserService.addUserWithRole(user,null); result.success("注册成功"); } catch (Exception e) { result.error500("注册失败"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 4abef418..4b872f1e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -633,18 +633,6 @@ public class SysUserServiceImpl extends ServiceImpl impl } } - //update-begin---author:wangshuai ---date:20230112 for：用户创建的时候增加临时角色 test------------ - //开启租户saas模式 - if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { - String testRoleId = "ee8626f80f7c2619917b6236f3a7f02b"; - //如果前台没有传递角色或者传过来的劫色没有临时角色,那么默认临时角色 test - if (oConvertUtils.isEmpty(selectedRoles) || !selectedRoles.contains(testRoleId)) { - SysUserRole userRole = new SysUserRole(user.getId(), testRoleId); - sysUserRoleMapper.insert(userRole); - } - } - //update-end---author:wangshuai ---date:20230112 for：用户创建的时候增加临时角色 test------------ - //step.3 保存所属部门 if(oConvertUtils.isNotEmpty(selectedDeparts)) { String[] arr = selectedDeparts.split(",");