expert_management.git

			@@ -21,6 +21,9 @@
			/** 用户封禁状态 */
			public static final String USER_DISABLE = "1";

			/** 角色正常状态 */
			public static final String ROLE_NORMAL = "0";

			/** 角色封禁状态 */
			public static final String ROLE_DISABLE = "1";

			@@ -7,6 +7,7 @@
			import org.aspectj.lang.annotation.Before;
			import org.springframework.stereotype.Component;
			import com.ruoyi.common.annotation.DataScope;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.domain.BaseEntity;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			@@ -73,8 +74,7 @@
			if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
			{
			String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
			dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
			controllerDataScope.userAlias(), permission);
			dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
			}
			}
			}
			@@ -94,7 +94,7 @@
			List<String> conditions = new ArrayList<String>();
			List<String> scopeCustomIds = new ArrayList<String>();
			user.getRoles().forEach(role -> {
			if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
			if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
			{
			scopeCustomIds.add(Convert.toStr(role.getRoleId()));
			}
			@@ -103,7 +103,7 @@
			for (SysRole role : user.getRoles())
			{
			String dataScope = role.getDataScope();
			if (conditions.contains(dataScope))
			if (conditions.contains(dataScope) \|\| StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))
			{
			continue;
			}

			@@ -6,8 +6,10 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;
			import org.springframework.util.CollectionUtils;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.service.ISysMenuService;
			import com.ruoyi.system.service.ISysRoleService;

			@@ -68,9 +70,12 @@
			// 多角色设置permissions属性，以便数据权限匹配权限
			for (SysRole role : roles)
			{
			Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
			role.setPermissions(rolePerms);
			perms.addAll(rolePerms);
			if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL))
			{
			Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
			role.setPermissions(rolePerms);
			perms.addAll(rolePerms);
			}
			}
			}
			else

	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史