~fuyongxin/sgd.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";

			@@ -6,6 +6,7 @@
			import org.aspectj.lang.annotation.Aspect;
			import org.aspectj.lang.annotation.Before;
			import org.springframework.stereotype.Component;
			import com.ruoyi.common.core.constant.UserConstants;
			import com.ruoyi.common.core.context.SecurityContextHolder;
			import com.ruoyi.common.core.text.Convert;
			import com.ruoyi.common.core.utils.StringUtils;
			@@ -73,8 +74,7 @@
			if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
			{
			String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
			dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
			controllerDataScope.userAlias(), permission);
			dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
			}
			}
			}
			@@ -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,6 +6,8 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.util.CollectionUtils;
			import com.ruoyi.common.core.constant.UserConstants;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.system.api.domain.SysRole;
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.service.ISysMenuService;
			@@ -71,9 +73,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/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java	3 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java	6 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java	11 ●●●●● patch \| view \| raw \| blame \| history