diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java b/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java index 4ffe9fed..f6aaa2c1 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java @@ -148,7 +148,7 @@ public class SysMenuController { @ResponseBody public ResponseResult addMenu(@RequestBody SysMenu sysMenu, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); +// sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); if(StrUtil.isBlank(sysMenu.getTenantId())){ sysMenu.setTenantId(sysMenu.getSystemcode()); } @@ -178,7 +178,7 @@ public class SysMenuController { if (sysMenuService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的菜单"); } - sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); +// sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); if(StrUtil.isBlank(sysMenu.getTenantId())){ sysMenu.setTenantId(sysMenu.getSystemcode()); } @@ -206,8 +206,8 @@ public class SysMenuController { public ResponseResult deleteIcon(@RequestParam String id, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysMenu::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysMenu::getId, id); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); if (sysMenuService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的菜单"); } @@ -234,7 +234,7 @@ public class SysMenuController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 修改是否显示 ，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("isdisplay", isdisplay).set( + updateWrapper.eq("id", id).set("isdisplay", isdisplay).set( "lastmodifier", userService.getUsername()).set( "lastmodifydate", new Timestamp(System.currentTimeMillis())); @@ -262,12 +262,12 @@ public class SysMenuController { @RequestParam int orderno, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysMenu::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysMenu::getId, id); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); if (sysMenuService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的菜单"); } - boolean ok = sysMenuService.moveOrderno(parentid, id, orderno, StrUtil.trimToNull(tenantId)); + boolean ok = sysMenuService.moveOrderno(parentid, id, orderno, null); if (ok) { return ResponseResult.success(); } else { @@ -288,8 +288,8 @@ public class SysMenuController { public ResponseResult deleteById(@RequestParam String id, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysMenu::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysMenu::getId, id); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); if (sysMenuService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的菜单"); } @@ -321,11 +321,11 @@ public class SysMenuController { return ResponseResult.error("切换失败！"); } LambdaQueryWrapper fromWrapper = new LambdaQueryWrapper<>(); - fromWrapper.eq(SysMenu::getId, fromId) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + fromWrapper.eq(SysMenu::getId, fromId); +// fromWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); LambdaQueryWrapper toWrapper = new LambdaQueryWrapper<>(); - toWrapper.eq(SysMenu::getId, toId) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + toWrapper.eq(SysMenu::getId, toId); +// toWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); if (sysMenuService.getOne(fromWrapper) == null || sysMenuService.getOne(toWrapper) == null) { return ResponseResult.error("存在不属于当前租户的菜单"); } @@ -350,8 +350,8 @@ public class SysMenuController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) throws FileNotFoundException { if (StrUtil.isNotBlank(menuId)) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysMenu::getId, menuId) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysMenu::getId, menuId); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); SysMenu sysMenu = sysMenuService.getOne(queryWrapper); if (sysMenu == null) { return ResponseResult.error("未找到对应租户的菜单"); diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java b/backend/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java index 907aaa1f..f0315668 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java @@ -53,7 +53,7 @@ public class SysOrganizationController { @ResponseBody public List> getOrgScopeTree(String roleId, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - return organizationService.getOrgScopeTree(roleId, StrUtil.trimToNull(tenantId)); + return organizationService.getOrgScopeTree(roleId, null); } /*********************************** @@ -67,7 +67,7 @@ public class SysOrganizationController { public List> getOrgTree(String parentid, String params, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - return organizationService.getOrgTree(parentid, params, StrUtil.trimToNull(tenantId)); + return organizationService.getOrgTree(parentid, params, null); } /*********************************** @@ -85,7 +85,7 @@ public class SysOrganizationController { return ResponseResult.error("查询失败！"); } List sysOrganizations = - organizationService.getOrganizationById(id, orgName, StrUtil.trimToNull(tenantId)); + organizationService.getOrganizationById(id, orgName, null); return ResponseResult.successData(sysOrganizations); } @@ -102,8 +102,8 @@ public class SysOrganizationController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysOrganization::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysOrganization::getId, id); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); SysOrganization sysOrganization = organizationService.getOne(queryWrapper); return ResponseResult.successData(sysOrganization); } @@ -127,7 +127,7 @@ public class SysOrganizationController { if("".equals(sysOrganization.getId())){ sysOrganization.setId(null); } - sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); +// sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); //填写 当前用户名称 sysOrganization.setLastmodifier(userService.getUsername()); //填写 当前日期 @@ -155,12 +155,12 @@ public class SysOrganizationController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysOrganization::getId, sysOrganization.getId()) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysOrganization::getId, sysOrganization.getId()); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); if (organizationService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的组织"); } - sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); +// sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); //填写 当前用户名称 sysOrganization.setLastmodifier(userService.getUsername()); //填写 当前日期 @@ -189,7 +189,7 @@ public class SysOrganizationController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 修改是否有效，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("isvaild", isvaild).set("lastmodifier" + updateWrapper.eq("id", id).set("isvaild", isvaild).set("lastmodifier" , userService.getUsername()).set("lastmodifydate", new Timestamp(System.currentTimeMillis())); boolean isOk = organizationService.update(updateWrapper); @@ -216,28 +216,24 @@ public class SysOrganizationController { for (String orgId : orgIds) { LambdaQueryWrapper currentWrapper = new LambdaQueryWrapper<>(); - currentWrapper.eq(SysOrganization::getId, orgId) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); + currentWrapper.eq(SysOrganization::getId, orgId); +// currentWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); if (organizationService.getOne(currentWrapper) == null) { - return ResponseResult.error("存在不属于当前租户的组织"); + return ResponseResult.error("不存在对应组织"); } - LambdaQueryWrapper queryWrapper = - new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId))； List list = - organizationService.list(queryWrapper.eq(SysOrganization::getParentid, orgId) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId))); + organizationService.list(queryWrapper.eq(SysOrganization::getParentid, orgId)); List ids = - list.stream().map(SysOrganization::getId).collect(Collectors.toList()); + list.stream().map(SysOrganization::getId).toList(); boolean isOk = organizationService.remove(new LambdaQueryWrapper() - .eq(SysOrganization::getId, orgId) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId))); + .eq(SysOrganization::getId, orgId)); if (!isOk) { continue; } for (String oid : ids) { - organizationService.remove(new LambdaQueryWrapper() - .eq(SysOrganization::getId, oid) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId))); + organizationService.remove(new LambdaQueryWrapper().eq(SysOrganization::getId, oid)); } } return ResponseResult.success(); diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SysRoleController.java b/backend/src/main/java/com/yfd/platform/system/controller/SysRoleController.java index fbb0bbc1..444e6837 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SysRoleController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SysRoleController.java @@ -55,7 +55,7 @@ public class SysRoleController { @ResponseBody public List list(@RequestParam(required = false) String rolename, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - return roleService.selectRoleList(rolename, StrUtil.trimToNull(tenantId)); + return roleService.selectRoleList(rolename, null); } /*********************************** @@ -70,8 +70,8 @@ public class SysRoleController { public ResponseResult getOneById(String id, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysRole::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysRole::getId, id); + queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); SysRole sysRole = roleService.getOne(queryWrapper); return ResponseResult.successData(sysRole); } @@ -88,7 +88,7 @@ public class SysRoleController { @ResponseBody public ResponseResult addRole(@RequestBody SysRole sysRole, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - sysRole.setTenantId(StrUtil.trimToNull(tenantId)); +// sysRole.setTenantId(StrUtil.trimToNull(tenantId)); boolean isOk = roleService.addRole(sysRole); if (isOk) { return ResponseResult.success(); @@ -113,7 +113,7 @@ public class SysRoleController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 更新权限，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("optscope", optscope).set( + updateWrapper.eq("id", id).set("optscope", optscope).set( "lastmodifier", userService.getUsername()).set( "lastmodifydate", LocalDateTime.now()); boolean ok = roleService.update(updateWrapper); @@ -141,8 +141,7 @@ public class SysRoleController { return ResponseResult.error("参数为空"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysRole::getId, id) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysRole::getId, id); if (roleService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的角色"); } @@ -158,8 +157,7 @@ public class SysRoleController { return ResponseResult.success(); } long menuCount = sysMenuService.count(new LambdaQueryWrapper() - .in(SysMenu::getId, menuIdList) - .eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId))); + .in(SysMenu::getId, menuIdList)); if (menuCount != menuIdList.size()) { return ResponseResult.error("存在不属于当前租户的菜单"); } @@ -188,7 +186,7 @@ public class SysRoleController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 更新组织范围，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("orgscope", orgscope).set( + updateWrapper.eq("id", id).set("orgscope", orgscope).set( "lastmodifier", userService.getUsername()).set( "lastmodifydate", LocalDateTime.now()); boolean ok = roleService.update(updateWrapper); @@ -215,7 +213,7 @@ public class SysRoleController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 更新业务范围，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("busscope", busscope).set( + updateWrapper.eq("id", id).set("busscope", busscope).set( "lastmodifier", userService.getUsername()).set( "lastmodifydate", LocalDateTime.now()); boolean ok = roleService.update(updateWrapper); @@ -240,8 +238,7 @@ public class SysRoleController { public ResponseResult setRoleUsers(String roleid, String userids, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); - roleWrapper.eq(SysRole::getId, roleid) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + roleWrapper.eq(SysRole::getId, roleid); if (roleService.getOne(roleWrapper) == null) { return ResponseResult.error("未找到对应租户的角色"); } @@ -270,8 +267,7 @@ public class SysRoleController { @RequestParam String userids, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); - roleWrapper.eq(SysRole::getId, roleid) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + roleWrapper.eq(SysRole::getId, roleid); if (roleService.getOne(roleWrapper) == null) { return ResponseResult.error("未找到对应租户的角色"); } @@ -298,7 +294,7 @@ public class SysRoleController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //根据id 更新业务范围，最近修改人，最近修改时间 - updateWrapper.eq("id", id).eq(StrUtil.isNotBlank(tenantId), "tenant_id", StrUtil.trim(tenantId)).set("isvaild", isvaild).set("lastmodifier" + updateWrapper.eq("id", id).set("isvaild", isvaild).set("lastmodifier" , userService.getUsername()).set("lastmodifydate", LocalDateTime.now()); boolean ok = roleService.update(updateWrapper); @@ -321,8 +317,7 @@ public class SysRoleController { public ResponseResult updateById(@RequestBody SysRole sysRole, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysRole::getId, sysRole.getId()) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysRole::getId, sysRole.getId()); if (roleService.getOne(queryWrapper) == null) { return ResponseResult.error("未找到对应租户的角色"); } @@ -354,8 +349,7 @@ public class SysRoleController { String[] roleIds = id.split(","); for (String roleId : roleIds) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysRole::getId, roleId) - .eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); + queryWrapper.eq(SysRole::getId, roleId); if (roleService.getOne(queryWrapper) == null) { return ResponseResult.error("存在不属于当前租户的角色"); } @@ -383,7 +377,7 @@ public class SysRoleController { String rolename, String isvaild, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { return roleService.listRoleUsers(orgid, username, status, level, - rolename, isvaild, StrUtil.trimToNull(tenantId)); + rolename, isvaild, null); } } diff --git a/backend/src/main/java/com/yfd/platform/system/controller/UserController.java b/backend/src/main/java/com/yfd/platform/system/controller/UserController.java index 4e0838cc..6ba65552 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/UserController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/UserController.java @@ -46,7 +46,7 @@ public class UserController { public ResponseResult addUser(@RequestBody SysUser user, String roleids, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - user.setTenantId(StrUtil.trimToNull(tenantId)); +// user.setTenantId(StrUtil.trimToNull(tenantId)); Map reslut = userService.addUser(user, roleids); return ResponseResult.successData(reslut); } @@ -80,7 +80,7 @@ public class UserController { @RequestHeader(value = "Tenant_id", required = false) String tenantId) { Page mapPage = userService.queryUsers(orgid, - username, StrUtil.trimToNull(tenantId), page); + username, null, page); return ResponseResult.successData(mapPage); } @@ -249,7 +249,7 @@ public class UserController { String name, String regStatus, @RequestHeader(value = "Tenant_id", required = false) String tenantId) { - Page result = userService.queryPendingAuditUsers(page, name, regStatus, StrUtil.trimToNull(tenantId)); + Page result = userService.queryPendingAuditUsers(page, name, regStatus, null); return ResponseResult.successData(result); } diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java index dcf3e8b6..e7681f67 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java @@ -81,8 +81,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl list = sysOrganizationMapper.selectList( new LambdaQueryWrapper() - .in(SysOrganization::getId, stringList) - .eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, tenantId)); + .in(SysOrganization::getId, stringList)); for (SysOrganization org : list) { if (org.getParentid() != null) { allowedOrgIds.add(org.getParentid()); @@ -97,9 +96,9 @@ public class SysOrganizationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysOrganization::getParentid, id); - queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, tenantId); +// queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, tenantId); if (StrUtil.isNotBlank(orgName)) { queryWrapper.like(SysOrganization::getOrgname, orgName); diff --git a/backend/src/main/resources/mapper/system/SysUserMapper.xml b/backend/src/main/resources/mapper/system/SysUserMapper.xml index dbda0bfe..c6b90b81 100644 --- a/backend/src/main/resources/mapper/system/SysUserMapper.xml +++ b/backend/src/main/resources/mapper/system/SysUserMapper.xml @@ -77,7 +77,8 @@ WHERE 1 = 1 AND ( ( u.REG_STATUS != 'PENDING' AND u.REG_STATUS != 'REJECTED' ) OR u.REG_STATUS IS NULL ) - AND u.usertype != 0 +-- AND u.usertype != 0 + AND u.username != 'admin' and u.orgid = #{orgid}