7/23

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<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid",dto.getSourceSid()));
         List<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().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);

src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeMapper.java

@@ -29,6 +29,6 @@ public interface SysRoleAuthorizeMapper extends BaseMapper<SysRoleAuthorize> {
 
     List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysRoleAuthorizeVo> qw);
     List<SysRoleAuthorizeVo> 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);
 }

src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java

@@ -106,7 +106,7 @@ public class SysRoleAuthorizeService extends MybatisBaseService<SysRoleAuthorize
 			}
 		}
 		List<SysRoleAuthorizeVo> 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<SysRoleAuthorize
 	public List<SysRoleAuthorizeVo> 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);
 	}
 }

src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java

@@ -1698,7 +1698,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
         ResultBean<String> rb = ResultBean.fireFail();
         String defalutId = "";
-        List<String> roleIdList = sysUserRoleService.selectRoleSid(query.getUserSid());
+        List<String> 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<SysUserMapper, SysUser> {
 //                List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
                 //最后一级的sid所属层级
 //                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));
-                List<String> roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid());
+                List<String> roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid(),"");
                 roleSidList.removeAll(Collections.singleton(null));
                 //查询层级对应的角色权限id
                 List<String> roleIdList = sysRoleService.selectByRole(roleSidList, menuSid, query.getUserSid());
@@ -1750,7 +1750,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
             //最后一级的sid所属层级
             SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));*/
-            List<String> roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid());
+            List<String> roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid(),"");
             roleSidList.removeAll(Collections.singleton(null));
             //查询层级对应的角色权限id
             List<String> roleSid = sysRoleService.selectByMobileRole(roleSidList, menuSid, query.getUserSid());

src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java

@@ -54,7 +54,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
     int deleteByRoleSid(String sids);
 
-    List<String> selectRoleSid(String userSid);
+    List<String> selectRoleSid(@Param("userSid")String userSid,@Param("orgSid")String orgSid);
 
     List<String> selectByUserSids(String userSid);
 }

src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml

@@ -59,7 +59,7 @@
     </delete>
 
 	<select id="selectRoleSid" resultType="java.lang.String">
-		select distinct dataRuleId from sys_user_role a left join sys_role b on a.roleSid =b.sid  where userSid = #{userSid} order by dataRuleId limit 1
+		select distinct dataRuleId from sys_user_role a left join sys_role b on a.roleSid =b.sid  where userSid = #{userSid} and b.orgSid =#{orgSid} order by dataRuleId limit 1
     </select>
 
 	<select id="selectByUserSids" resultType="java.lang.String">

src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleService.java

@@ -127,8 +127,8 @@ public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, Sy
 		return baseMapper.deleteByRoleSid(sids);
 	}
 
-	public List<String> selectRoleSid(String userSid) {
-		return baseMapper.selectRoleSid(userSid);
+	public List<String> selectRoleSid(String userSid,String orgSid) {
+		return baseMapper.selectRoleSid(userSid,orgSid);
 	}
 
 	public ResultBean<List<String>> selectByUserSids(String userSid) {