zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化登录门户逻辑

Browse Source
This commit is contained in:
tangwei 2026-08-03 11:17:38 +08:00
parent 7ba5c1b1db
commit 30abebea60
6 changed files with 60 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
View File

@ -148,7 +148,7 @@ public class SysMenuController {
@ResponseBody @ResponseBody
public ResponseResult addMenu(@RequestBody SysMenu sysMenu, public ResponseResult addMenu(@RequestBody SysMenu sysMenu,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); // sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
if(StrUtil.isBlank(sysMenu.getTenantId())){ if(StrUtil.isBlank(sysMenu.getTenantId())){
sysMenu.setTenantId(sysMenu.getSystemcode()); sysMenu.setTenantId(sysMenu.getSystemcode());
} }
@ -178,7 +178,7 @@ public class SysMenuController {
if (sysMenuService.getOne(queryWrapper) == null) { if (sysMenuService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的菜单"); return ResponseResult.error("未找到对应租户的菜单");
} }
sysMenu.setTenantId(StrUtil.trimToNull(tenantId)); // sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
if(StrUtil.isBlank(sysMenu.getTenantId())){ if(StrUtil.isBlank(sysMenu.getTenantId())){
sysMenu.setTenantId(sysMenu.getSystemcode()); sysMenu.setTenantId(sysMenu.getSystemcode());
} }
@ -206,8 +206,8 @@ public class SysMenuController {
public ResponseResult deleteIcon(@RequestParam String id, public ResponseResult deleteIcon(@RequestParam String id,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysMenu::getId, id) queryWrapper.eq(SysMenu::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
if (sysMenuService.getOne(queryWrapper) == null) { if (sysMenuService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的菜单"); return ResponseResult.error("未找到对应租户的菜单");
} }
@ -234,7 +234,7 @@ public class SysMenuController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysMenu> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysMenu> updateWrapper = new UpdateWrapper<>();
//根据id 修改是否显示 ，最近修改人，最近修改时间 //根据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( "lastmodifier", userService.getUsername()).set(
"lastmodifydate", "lastmodifydate",
new Timestamp(System.currentTimeMillis())); new Timestamp(System.currentTimeMillis()));
@ -262,12 +262,12 @@ public class SysMenuController {
@RequestParam int orderno, @RequestParam int orderno,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysMenu::getId, id) queryWrapper.eq(SysMenu::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
if (sysMenuService.getOne(queryWrapper) == null) { if (sysMenuService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的菜单"); return ResponseResult.error("未找到对应租户的菜单");
} }
boolean ok = sysMenuService.moveOrderno(parentid, id, orderno, StrUtil.trimToNull(tenantId)); boolean ok = sysMenuService.moveOrderno(parentid, id, orderno, null);
if (ok) { if (ok) {
return ResponseResult.success(); return ResponseResult.success();
} else { } else {
@ -288,8 +288,8 @@ public class SysMenuController {
public ResponseResult deleteById(@RequestParam String id, public ResponseResult deleteById(@RequestParam String id,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysMenu::getId, id) queryWrapper.eq(SysMenu::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
if (sysMenuService.getOne(queryWrapper) == null) { if (sysMenuService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的菜单"); return ResponseResult.error("未找到对应租户的菜单");
} }
@ -321,11 +321,11 @@ public class SysMenuController {
return ResponseResult.error("切换失败！"); return ResponseResult.error("切换失败！");
} }
LambdaQueryWrapper<SysMenu> fromWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> fromWrapper = new LambdaQueryWrapper<>();
fromWrapper.eq(SysMenu::getId, fromId) fromWrapper.eq(SysMenu::getId, fromId);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // fromWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
LambdaQueryWrapper<SysMenu> toWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> toWrapper = new LambdaQueryWrapper<>();
toWrapper.eq(SysMenu::getId, toId) toWrapper.eq(SysMenu::getId, toId);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // toWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
if (sysMenuService.getOne(fromWrapper) == null || sysMenuService.getOne(toWrapper) == null) { if (sysMenuService.getOne(fromWrapper) == null || sysMenuService.getOne(toWrapper) == null) {
return ResponseResult.error("存在不属于当前租户的菜单"); return ResponseResult.error("存在不属于当前租户的菜单");
} }
@ -350,8 +350,8 @@ public class SysMenuController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) throws FileNotFoundException { @RequestHeader(value = "Tenant_id", required = false) String tenantId) throws FileNotFoundException {
if (StrUtil.isNotBlank(menuId)) { if (StrUtil.isNotBlank(menuId)) {
LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysMenu::getId, menuId) queryWrapper.eq(SysMenu::getId, menuId);
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId));
SysMenu sysMenu = sysMenuService.getOne(queryWrapper); SysMenu sysMenu = sysMenuService.getOne(queryWrapper);
if (sysMenu == null) { if (sysMenu == null) {
return ResponseResult.error("未找到对应租户的菜单"); return ResponseResult.error("未找到对应租户的菜单");

42
backend/src/main/java/com/yfd/platform/system/controller/SysOrganizationController.java
View File

@ -53,7 +53,7 @@ public class SysOrganizationController {
@ResponseBody @ResponseBody
public List<Map<String, Object>> getOrgScopeTree(String roleId, public List<Map<String, Object>> getOrgScopeTree(String roleId,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @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<Map<String, Object>> getOrgTree(String parentid, public List<Map<String, Object>> getOrgTree(String parentid,
String params, String params,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @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("查询失败！"); return ResponseResult.error("查询失败！");
} }
List<SysOrganization> sysOrganizations = List<SysOrganization> sysOrganizations =
organizationService.getOrganizationById(id, orgName, StrUtil.trimToNull(tenantId)); organizationService.getOrganizationById(id, orgName, null);
return ResponseResult.successData(sysOrganizations); return ResponseResult.successData(sysOrganizations);
} }
@ -102,8 +102,8 @@ public class SysOrganizationController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysOrganization> queryWrapper = LambdaQueryWrapper<SysOrganization> queryWrapper =
new LambdaQueryWrapper<>(); new LambdaQueryWrapper<>();
queryWrapper.eq(SysOrganization::getId, id) queryWrapper.eq(SysOrganization::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId));
SysOrganization sysOrganization = organizationService.getOne(queryWrapper); SysOrganization sysOrganization = organizationService.getOne(queryWrapper);
return ResponseResult.successData(sysOrganization); return ResponseResult.successData(sysOrganization);
} }
@ -127,7 +127,7 @@ public class SysOrganizationController {
if("".equals(sysOrganization.getId())){ if("".equals(sysOrganization.getId())){
sysOrganization.setId(null); sysOrganization.setId(null);
} }
sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); // sysOrganization.setTenantId(StrUtil.trimToNull(tenantId));
//填写 当前用户名称 //填写 当前用户名称
sysOrganization.setLastmodifier(userService.getUsername()); sysOrganization.setLastmodifier(userService.getUsername());
//填写 当前日期 //填写 当前日期
@ -155,12 +155,12 @@ public class SysOrganizationController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysOrganization> queryWrapper = LambdaQueryWrapper<SysOrganization> queryWrapper =
new LambdaQueryWrapper<>(); new LambdaQueryWrapper<>();
queryWrapper.eq(SysOrganization::getId, sysOrganization.getId()) queryWrapper.eq(SysOrganization::getId, sysOrganization.getId());
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId));
if (organizationService.getOne(queryWrapper) == null) { if (organizationService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的组织"); return ResponseResult.error("未找到对应租户的组织");
} }
sysOrganization.setTenantId(StrUtil.trimToNull(tenantId)); // sysOrganization.setTenantId(StrUtil.trimToNull(tenantId));
//填写 当前用户名称 //填写 当前用户名称
sysOrganization.setLastmodifier(userService.getUsername()); sysOrganization.setLastmodifier(userService.getUsername());
//填写 当前日期 //填写 当前日期
@ -189,7 +189,7 @@ public class SysOrganizationController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysOrganization> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysOrganization> updateWrapper = new UpdateWrapper<>();
//根据id 修改是否有效，最近修改人，最近修改时间 //根据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", , userService.getUsername()).set("lastmodifydate",
new Timestamp(System.currentTimeMillis())); new Timestamp(System.currentTimeMillis()));
boolean isOk = organizationService.update(updateWrapper); boolean isOk = organizationService.update(updateWrapper);
@ -216,28 +216,24 @@ public class SysOrganizationController {
for (String orgId : orgIds) { for (String orgId : orgIds) {
LambdaQueryWrapper<SysOrganization> currentWrapper = LambdaQueryWrapper<SysOrganization> currentWrapper =
new LambdaQueryWrapper<>(); new LambdaQueryWrapper<>();
currentWrapper.eq(SysOrganization::getId, orgId) currentWrapper.eq(SysOrganization::getId, orgId);
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)); // currentWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId));
if (organizationService.getOne(currentWrapper) == null) { if (organizationService.getOne(currentWrapper) == null) {
return ResponseResult.error("存在不属于当前租户的组织"); return ResponseResult.error("不存在对应组织");
} }
LambdaQueryWrapper<SysOrganization> queryWrapper = LambdaQueryWrapper<SysOrganization> queryWrapper = new LambdaQueryWrapper<>();
new LambdaQueryWrapper<>(); // queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId))；
List<SysOrganization> list = List<SysOrganization> list =
organizationService.list(queryWrapper.eq(SysOrganization::getParentid, orgId) organizationService.list(queryWrapper.eq(SysOrganization::getParentid, orgId));
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)));
List<String> ids = List<String> ids =
list.stream().map(SysOrganization::getId).collect(Collectors.toList()); list.stream().map(SysOrganization::getId).toList();
boolean isOk = organizationService.remove(new LambdaQueryWrapper<SysOrganization>() boolean isOk = organizationService.remove(new LambdaQueryWrapper<SysOrganization>()
.eq(SysOrganization::getId, orgId) .eq(SysOrganization::getId, orgId));
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)));
if (!isOk) { if (!isOk) {
continue; continue;
} }
for (String oid : ids) { for (String oid : ids) {
organizationService.remove(new LambdaQueryWrapper<SysOrganization>() organizationService.remove(new LambdaQueryWrapper<SysOrganization>().eq(SysOrganization::getId, oid));
.eq(SysOrganization::getId, oid)
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, StrUtil.trim(tenantId)));
} }
} }
return ResponseResult.success(); return ResponseResult.success();

36
backend/src/main/java/com/yfd/platform/system/controller/SysRoleController.java
View File

@ -55,7 +55,7 @@ public class SysRoleController {
@ResponseBody @ResponseBody
public List<SysRole> list(@RequestParam(required = false) String rolename, public List<SysRole> list(@RequestParam(required = false) String rolename,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @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, public ResponseResult getOneById(String id,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysRole::getId, id) queryWrapper.eq(SysRole::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId)); queryWrapper.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
SysRole sysRole = roleService.getOne(queryWrapper); SysRole sysRole = roleService.getOne(queryWrapper);
return ResponseResult.successData(sysRole); return ResponseResult.successData(sysRole);
} }
@ -88,7 +88,7 @@ public class SysRoleController {
@ResponseBody @ResponseBody
public ResponseResult addRole(@RequestBody SysRole sysRole, public ResponseResult addRole(@RequestBody SysRole sysRole,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
sysRole.setTenantId(StrUtil.trimToNull(tenantId)); // sysRole.setTenantId(StrUtil.trimToNull(tenantId));
boolean isOk = roleService.addRole(sysRole); boolean isOk = roleService.addRole(sysRole);
if (isOk) { if (isOk) {
return ResponseResult.success(); return ResponseResult.success();
@ -113,7 +113,7 @@ public class SysRoleController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
//根据id 更新权限，最近修改人，最近修改时间 //根据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( "lastmodifier", userService.getUsername()).set(
"lastmodifydate", LocalDateTime.now()); "lastmodifydate", LocalDateTime.now());
boolean ok = roleService.update(updateWrapper); boolean ok = roleService.update(updateWrapper);
@ -141,8 +141,7 @@ public class SysRoleController {
return ResponseResult.error("参数为空"); return ResponseResult.error("参数为空");
} }
LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysRole::getId, id) queryWrapper.eq(SysRole::getId, id);
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
if (roleService.getOne(queryWrapper) == null) { if (roleService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的角色"); return ResponseResult.error("未找到对应租户的角色");
} }
@ -158,8 +157,7 @@ public class SysRoleController {
return ResponseResult.success(); return ResponseResult.success();
} }
long menuCount = sysMenuService.count(new LambdaQueryWrapper<SysMenu>() long menuCount = sysMenuService.count(new LambdaQueryWrapper<SysMenu>()
.in(SysMenu::getId, menuIdList) .in(SysMenu::getId, menuIdList));
.eq(StrUtil.isNotBlank(tenantId), SysMenu::getTenantId, StrUtil.trim(tenantId)));
if (menuCount != menuIdList.size()) { if (menuCount != menuIdList.size()) {
return ResponseResult.error("存在不属于当前租户的菜单"); return ResponseResult.error("存在不属于当前租户的菜单");
} }
@ -188,7 +186,7 @@ public class SysRoleController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
//根据id 更新组织范围，最近修改人，最近修改时间 //根据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( "lastmodifier", userService.getUsername()).set(
"lastmodifydate", LocalDateTime.now()); "lastmodifydate", LocalDateTime.now());
boolean ok = roleService.update(updateWrapper); boolean ok = roleService.update(updateWrapper);
@ -215,7 +213,7 @@ public class SysRoleController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
//根据id 更新业务范围，最近修改人，最近修改时间 //根据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( "lastmodifier", userService.getUsername()).set(
"lastmodifydate", LocalDateTime.now()); "lastmodifydate", LocalDateTime.now());
boolean ok = roleService.update(updateWrapper); boolean ok = roleService.update(updateWrapper);
@ -240,8 +238,7 @@ public class SysRoleController {
public ResponseResult setRoleUsers(String roleid, String userids, public ResponseResult setRoleUsers(String roleid, String userids,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>();
roleWrapper.eq(SysRole::getId, roleid) roleWrapper.eq(SysRole::getId, roleid);
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
if (roleService.getOne(roleWrapper) == null) { if (roleService.getOne(roleWrapper) == null) {
return ResponseResult.error("未找到对应租户的角色"); return ResponseResult.error("未找到对应租户的角色");
} }
@ -270,8 +267,7 @@ public class SysRoleController {
@RequestParam String userids, @RequestParam String userids,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>();
roleWrapper.eq(SysRole::getId, roleid) roleWrapper.eq(SysRole::getId, roleid);
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
if (roleService.getOne(roleWrapper) == null) { if (roleService.getOne(roleWrapper) == null) {
return ResponseResult.error("未找到对应租户的角色"); return ResponseResult.error("未找到对应租户的角色");
} }
@ -298,7 +294,7 @@ public class SysRoleController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
//根据id 更新业务范围，最近修改人，最近修改时间 //根据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", , userService.getUsername()).set("lastmodifydate",
LocalDateTime.now()); LocalDateTime.now());
boolean ok = roleService.update(updateWrapper); boolean ok = roleService.update(updateWrapper);
@ -321,8 +317,7 @@ public class SysRoleController {
public ResponseResult updateById(@RequestBody SysRole sysRole, public ResponseResult updateById(@RequestBody SysRole sysRole,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysRole::getId, sysRole.getId()) queryWrapper.eq(SysRole::getId, sysRole.getId());
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
if (roleService.getOne(queryWrapper) == null) { if (roleService.getOne(queryWrapper) == null) {
return ResponseResult.error("未找到对应租户的角色"); return ResponseResult.error("未找到对应租户的角色");
} }
@ -354,8 +349,7 @@ public class SysRoleController {
String[] roleIds = id.split(","); String[] roleIds = id.split(",");
for (String roleId : roleIds) { for (String roleId : roleIds) {
LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysRole::getId, roleId) queryWrapper.eq(SysRole::getId, roleId);
.eq(StrUtil.isNotBlank(tenantId), SysRole::getTenantId, StrUtil.trim(tenantId));
if (roleService.getOne(queryWrapper) == null) { if (roleService.getOne(queryWrapper) == null) {
return ResponseResult.error("存在不属于当前租户的角色"); return ResponseResult.error("存在不属于当前租户的角色");
} }
@ -383,7 +377,7 @@ public class SysRoleController {
String rolename, String isvaild, String rolename, String isvaild,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
return roleService.listRoleUsers(orgid, username, status, level, return roleService.listRoleUsers(orgid, username, status, level,
rolename, isvaild, StrUtil.trimToNull(tenantId)); rolename, isvaild, null);
} }
} }

6
backend/src/main/java/com/yfd/platform/system/controller/UserController.java
View File

@ -46,7 +46,7 @@ public class UserController {
public ResponseResult addUser(@RequestBody SysUser user, public ResponseResult addUser(@RequestBody SysUser user,
String roleids, String roleids,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
user.setTenantId(StrUtil.trimToNull(tenantId)); // user.setTenantId(StrUtil.trimToNull(tenantId));
Map reslut = userService.addUser(user, roleids); Map reslut = userService.addUser(user, roleids);
return ResponseResult.successData(reslut); return ResponseResult.successData(reslut);
} }
@ -80,7 +80,7 @@ public class UserController {
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
Page<SysUser> mapPage = userService.queryUsers(orgid, Page<SysUser> mapPage = userService.queryUsers(orgid,
username, StrUtil.trimToNull(tenantId), page); username, null, page);
return ResponseResult.successData(mapPage); return ResponseResult.successData(mapPage);
} }
@ -249,7 +249,7 @@ public class UserController {
String name, String name,
String regStatus, String regStatus,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) { @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
Page<SysUser> result = userService.queryPendingAuditUsers(page, name, regStatus, StrUtil.trimToNull(tenantId)); Page<SysUser> result = userService.queryPendingAuditUsers(page, name, regStatus, null);
return ResponseResult.successData(result); return ResponseResult.successData(result);
} }

11
backend/src/main/java/com/yfd/platform/system/service/impl/SysOrganizationServiceImpl.java
View File

@ -81,8 +81,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
// 查询这些组织的父级ID // 查询这些组织的父级ID
List<SysOrganization> list = sysOrganizationMapper.selectList( List<SysOrganization> list = sysOrganizationMapper.selectList(
new LambdaQueryWrapper<SysOrganization>() new LambdaQueryWrapper<SysOrganization>()
.in(SysOrganization::getId, stringList) .in(SysOrganization::getId, stringList));
.eq(StrUtil.isNotBlank(tenantId), SysOrganization::getTenantId, tenantId));
for (SysOrganization org : list) { for (SysOrganization org : list) {
if (org.getParentid() != null) { if (org.getParentid() != null) {
allowedOrgIds.add(org.getParentid()); allowedOrgIds.add(org.getParentid());
@ -97,9 +96,9 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
if (!allowedOrgIds.isEmpty()) { if (!allowedOrgIds.isEmpty()) {
queryWrapper.in("id", allowedOrgIds); queryWrapper.in("id", allowedOrgIds);
} }
if (StrUtil.isNotBlank(tenantId)) { // if (StrUtil.isNotBlank(tenantId)) {
queryWrapper.eq("tenant_id", tenantId); // queryWrapper.eq("tenant_id", tenantId);
} // }
if (StrUtil.isNotEmpty(params)) { if (StrUtil.isNotEmpty(params)) {
queryWrapper.like("orgname", params); queryWrapper.like("orgname", params);
} }
@ -274,7 +273,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
// 构建查询条件 // 构建查询条件
LambdaQueryWrapper<SysOrganization> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysOrganization> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysOrganization::getParentid, id); 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)) { if (StrUtil.isNotBlank(orgName)) {
queryWrapper.like(SysOrganization::getOrgname, orgName); queryWrapper.like(SysOrganization::getOrgname, orgName);

3
backend/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -77,7 +77,8 @@
WHERE WHERE
1 = 1 1 = 1
AND ( ( u.REG_STATUS != 'PENDING' AND u.REG_STATUS != 'REJECTED' ) OR u.REG_STATUS IS NULL ) 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'
<if test="orgid != null"> <if test="orgid != null">
and u.orgid = #{orgid} and u.orgid = #{orgid}
</if> </if>