lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2026-07-28 06:07:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: lsm:ac49f0e80fd20a095c779fb41be8c3a42bfe3c80
Branches Tags
lsm:main lsm:lowcode lsm:4.0
lsm:8.4 lsm:8.3.5 lsm:8.3.4 lsm:8.3.3 lsm:8.3.1 lsm:8.3 lsm:8.2 lsm:8.1.1 lsm:8.1 lsm:8.0 lsm:7.8 lsm:7.7 lsm:7.6 lsm:7.5 lsm:7.4 lsm:v7.3 lsm:7.3 lsm:7.2 lsm:7.1 lsm:v7.0 lsm:v6.5 lsm:v6.4 lsm:v6.3 lsm:6.2 lsm:6.1 lsm:6.0 lsm:5.4 lsm:5.3 lsm:5.2 lsm:5.1 lsm:v.5.0.1 lsm:v5.0.0 lsm:v4.0 lsm:3.0alpha lsm:v2.0beta lsm:v1.2
...
compare: lsm:aac40f9e67e8af80b6120b7c01b07d0bd9c5413e
Branches Tags
lsm:main lsm:lowcode lsm:4.0
lsm:8.4 lsm:8.3.5 lsm:8.3.4 lsm:8.3.3 lsm:8.3.1 lsm:8.3 lsm:8.2 lsm:8.1.1 lsm:8.1 lsm:8.0 lsm:7.8 lsm:7.7 lsm:7.6 lsm:7.5 lsm:7.4 lsm:v7.3 lsm:7.3 lsm:7.2 lsm:7.1 lsm:v7.0 lsm:v6.5 lsm:v6.4 lsm:v6.3 lsm:6.2 lsm:6.1 lsm:6.0 lsm:5.4 lsm:5.3 lsm:5.2 lsm:5.1 lsm:v.5.0.1 lsm:v5.0.0 lsm:v4.0 lsm:3.0alpha lsm:v2.0beta lsm:v1.2

4 Commits
ac49f0e80f ... aac40f9e67

Author SHA1 Message Date
yubaolee
aac40f9e67 🐛fix: #IDJIPY 修复字典排序 2026-01-16 14:40:33 +08:00
yubaolee
ad18885596 🐛fix: #IDJIPY 删除全部部门提示异常 2026-01-15 17:33:02 +08:00
yubaolee
6302ad4bca 🐛fix: #ICZD3Z 2026-01-10 13:46:31 +08:00
yubaolee
f30fe5e11d 🐛fix: #ICZD3Z 2026-01-10 11:15:33 +08:00
3 changed files with 13 additions and 4 deletions
Expand all files Collapse all files

11
OpenAuth.App/Base/SqlSugarBaseApp.cs
View File

@@ -11,6 +11,7 @@ using OpenAuth.Repository.Domain;
using SqlSugar;
using Autofac;
using Infrastructure.Extensions.AutofacManager;
using MySql.Data.MySqlClient.Memcached;
namespace OpenAuth.App
{
@@ -69,7 +70,15 @@ namespace OpenAuth.App
if (loginUser.User.Account == Define.SYSTEM_USERNAME) return SugarClient.Queryable<T>(); //超级管理员特权
var moduleName = typeof(T).Name;
var rule = SugarClient.Queryable<DataPrivilegeRule>().First(u => u.SourceCode == moduleName);
//数据权限永远只用默认连接字符串，避免租户隔离
ISqlSugarClient defualtClient = SugarClient;
var currentConfigId = SugarClient.CurrentConnectionConfig.ConfigId;
if(currentConfigId != null && currentConfigId.ToString() !=""){
defualtClient = SugarClient.AsTenant().GetConnection("");
}
var rule = defualtClient.Queryable<DataPrivilegeRule>().First(u => u.SourceCode == moduleName);
if (rule == null) return SugarClient.Queryable<T>(); //没有设置数据规则，那么视为该资源允许被任何主体查看
if (rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINUSER) ||
rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINROLE)||

2
OpenAuth.App/Category/CategoryApp.cs
View File

@@ -55,7 +55,7 @@ namespace OpenAuth.App
var propertyStr = string.Join(',', columnFields.Select(u =>u.ColumnName));
result.ColumnFields = columnFields;
result.Data = objs.OrderBy(u => u.DtCode)
result.Data = objs.OrderBy(u => u.SortNo).OrderBy(u => u.DtCode)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.Count = await objs.CountAsync();

4
OpenAuth.WebApi/Controllers/CheckController.cs
View File

@@ -189,8 +189,8 @@ namespace OpenAuth.WebApi.Controllers
{
return new PagedDynamicDataResp
{
Message = "未找到指定的节点",
Code = 500,
Data = new List<OrgView>(),
Count = 0
};
}
cascadeId = org.CascadeId;