mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2025-09-20 10:37:55 +08:00
全面修改Id为Guid类型,为2.0版做准备
This commit is contained in:
@@ -26,7 +26,7 @@ namespace OpenAuth.Domain.Service
|
||||
/// <summary>
|
||||
/// 根据部门ID得到进出库信息
|
||||
/// </summary>
|
||||
public dynamic Load(string username, int orgId, int pageindex, int pagesize)
|
||||
public dynamic Load(string username, Guid orgId, int pageindex, int pagesize)
|
||||
{
|
||||
|
||||
_authoriseService.LoadAuthControls(username);
|
||||
@@ -47,8 +47,7 @@ namespace OpenAuth.Domain.Service
|
||||
|
||||
var keys = _authoriseService.Resources.Select(r => r.Key); //用户可访问的资源的KEY列表
|
||||
|
||||
//由于库存Stock表开始没有设计资源有关的字段,暂时用User字段代替
|
||||
Expression<Func<Stock, bool>> exp = u => orgs.Contains(u.OrgId) && (u.User == "" || keys.Contains(u.User));
|
||||
Expression<Func<Stock, bool>> exp = u => u.OrgId != null &&orgs.Contains(u.OrgId.Value) && (u.Viewable == "" || keys.Contains(u.Viewable));
|
||||
var stocks = _repository.Find(pageindex, pagesize, "", exp);
|
||||
int total = _repository.GetCount(exp);
|
||||
|
||||
@@ -61,7 +60,7 @@ namespace OpenAuth.Domain.Service
|
||||
};
|
||||
}
|
||||
|
||||
public Stock Find(int id)
|
||||
public Stock Find(Guid id)
|
||||
{
|
||||
var stock = _repository.FindSingle(u => u.Id == id);
|
||||
if (stock == null) return new Stock();
|
||||
@@ -69,7 +68,7 @@ namespace OpenAuth.Domain.Service
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void Delete(int id)
|
||||
public void Delete(Guid id)
|
||||
{
|
||||
_repository.Delete(id);
|
||||
}
|
||||
@@ -77,7 +76,7 @@ namespace OpenAuth.Domain.Service
|
||||
public void AddOrUpdate(Stock stock)
|
||||
{
|
||||
|
||||
if (stock.Id == 0)
|
||||
if (stock.Id == Guid.Empty)
|
||||
{
|
||||
_repository.Add(stock);
|
||||
}
|
||||
|
Reference in New Issue
Block a user