diff --git a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index c66466b..4de167c 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -584,6 +584,7 @@ public class SysUserRest { sysRole.setSort(0); sysRole.setType(1); sysRole.setOrgSid(sysOrg.getSid()); + sysRole.setDataRuleId("1"); sysRoleService.save(sysRole); // List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid",dto.getSourceSid())); List sysMenus=sysMenuService.list(new QueryWrapper().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33")); @@ -592,6 +593,7 @@ public class SysUserRest { SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize(); sysRoleAuthorize.setRoleSid(sysRole.getSid()); sysRoleAuthorize.setMenuSid(sysMenu.getSid()); + sysRoleAuthorize.setSourceSid(dto.getSourceSid()); sysRoleAuthorizes.add(sysRoleAuthorize); } sysRoleAuthorizeService.saveBatch(sysRoleAuthorizes); diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java index 4733f8c..6da2e8c 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java @@ -29,6 +29,6 @@ public interface SysRoleAuthorizeMapper extends BaseMapper { List list(@Param(Constants.WRAPPER) QueryWrapper qw); List selectByRoleSid(String roleSid); - @Delete("delete from sys_role_authorize where roleSid=#{roleSid}") - void delByRoleSid(@Param("roleSid") String roleSid); + @Delete("delete from sys_role_authorize where roleSid=#{roleSid} and sourceSid =#{sourceSid}") + void delByRoleSid(@Param("roleSid") String roleSid,@Param("sourceSid") String sourceSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java index b4bbd80..deea6ab 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java @@ -106,7 +106,7 @@ public class SysRoleAuthorizeService extends MybatisBaseService menuRoleList = selectByRoleSid(roleSid); - delByRoleSid(roleSid); + delByRoleSid(roleSid,dto.getSourceSid()); ResultBean rb = ResultBean.fireFail(); if(!com.yxt.common.base.utils.StringUtils.isBlank(menuSid)){ String[] sids = menuSid.split(","); @@ -127,7 +127,7 @@ public class SysRoleAuthorizeService extends MybatisBaseService selectByRoleSid(String roleSid) { return baseMapper.selectByRoleSid(roleSid); } - public void delByRoleSid(String roleSid) { - baseMapper.delByRoleSid(roleSid); + public void delByRoleSid(String roleSid,String sourceSid) { + baseMapper.delByRoleSid(roleSid,sourceSid); } } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java index 6558c0d..f6f0a79 100644 --- a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java @@ -1698,7 +1698,7 @@ public class SysUserService extends MybatisBaseService { public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { ResultBean rb = ResultBean.fireFail(); String defalutId = ""; - List roleIdList = sysUserRoleService.selectRoleSid(query.getUserSid()); + List roleIdList = sysUserRoleService.selectRoleSid(query.getUserSid(),query.getOrgPath()); roleIdList.removeAll(Collections.singleton(null)); if (!roleIdList.isEmpty()) { for (int i = 0; i < roleIdList.size(); i++) { @@ -1728,7 +1728,7 @@ public class SysUserService extends MybatisBaseService { // List stringList = Arrays.asList(query.getOrgPath().split("/")); //最后一级的sid所属层级 // SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1)); - List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid()); + List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid(),""); roleSidList.removeAll(Collections.singleton(null)); //查询层级对应的角色权限id List roleIdList = sysRoleService.selectByRole(roleSidList, menuSid, query.getUserSid()); @@ -1750,7 +1750,7 @@ public class SysUserService extends MybatisBaseService { List stringList = Arrays.asList(query.getOrgPath().split("/")); //最后一级的sid所属层级 SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));*/ - List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid()); + List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid(),""); roleSidList.removeAll(Collections.singleton(null)); //查询层级对应的角色权限id List roleSid = sysRoleService.selectByMobileRole(roleSidList, menuSid, query.getUserSid()); diff --git a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java index a71298f..9d8d078 100644 --- a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java @@ -54,7 +54,7 @@ public interface SysUserRoleMapper extends BaseMapper { int deleteByRoleSid(String sids); - List selectRoleSid(String userSid); + List selectRoleSid(@Param("userSid")String userSid,@Param("orgSid")String orgSid); List selectByUserSids(String userSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml index e4392b9..e4f58ae 100644 --- a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml @@ -59,7 +59,7 @@