Zel/WaterCloudForJt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11111111

Browse Source
This commit is contained in:
Zel
2025-03-16 23:05:57 +08:00
parent ffc6426a0a
commit 09a9aadd3e
3 changed files with 133 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
WaterCloud.Service/OrderManagement/OrderCustomerService.cs
View File

@@ -6,6 +6,10 @@ using WaterCloud.Code;
using SqlSugar;
using WaterCloud.DataBase;
using WaterCloud.Domain.OrderManagement;
using System.Collections;
using static Serenity.Web.PropertyItemsScript;
using WaterCloud.Service.SystemOrganize;
using System.Diagnostics;
namespace WaterCloud.Service.OrderManagement
{
@@ -16,6 +20,8 @@ namespace WaterCloud.Service.OrderManagement
/// </summary>
public class OrderCustomerService : BaseService<OrderCustomerEntity>, IDenpendency
{
public UserService UserService { get; set; }
public OrderCustomerService(ISqlSugarClient context) : base(context)
{
}
@@ -28,7 +34,14 @@ namespace WaterCloud.Service.OrderManagement
data = data.Where(a => a.F_Name.Contains(keyword)
|| a.F_ContactPerson.Contains(keyword));
}
return await data.Where(a => a.F_DeleteMark == false).OrderBy(a => a.F_CreatorTime , OrderByType.Desc).ToListAsync();
//普通用户仅可查看自己的数据
if (!(currentuser.IsAdmin || currentuser.IsBoss || currentuser.IsSuperAdmin || currentuser.IsSenior))
{
data = data.Where(oo => oo.F_CreatorUserId == currentuser.UserId);
}
return await data.Where(a => a.F_DeleteMark == false).OrderBy(a => a.F_CreatorTime, OrderByType.Desc).ToListAsync();
}
public async Task<List<OrderCustomerEntity>> GetLookList(string keyword = "")
@@ -40,12 +53,26 @@ namespace WaterCloud.Service.OrderManagement
query = query.Where(a => a.F_Name.Contains(keyword)
|| a.F_ContactPerson.Contains(keyword));
}
//权限过滤
query = GetDataPrivilege("a", "", query);
return await query.OrderBy(a => a.F_CreatorTime , OrderByType.Desc).ToListAsync();
//权限过滤
query = GetDataPrivilege("a", "", query);
//普通用户仅可查看自己的数据
if (!(currentuser.IsAdmin || currentuser.IsBoss || currentuser.IsSuperAdmin || currentuser.IsSenior))
{
query = query.Where(oo => oo.F_CreatorUserId == currentuser.UserId);
}
var pageList = await query.OrderBy(a => a.F_CreatorTime, OrderByType.Desc).ToListAsync();
var users = await UserService.GetUserList(string.Empty);
pageList.ForEach(item =>
{
var user = users.Find(oo => oo.F_Id == item.F_CreatorUserId);
item.F_CreatorUserId = user == null ? "未知用户" : user.F_RealName;
});
return pageList;
}
public async Task<List<OrderCustomerEntity>> GetLookList(SoulPage<OrderCustomerEntity> pagination,string keyword = "",string id="")
public async Task<List<OrderCustomerEntity>> GetLookList(SoulPage<OrderCustomerEntity> pagination, string keyword = "", string id = "")
{
var query = repository.IQueryable().Where(a => a.F_DeleteMark == false);
if (!string.IsNullOrEmpty(keyword))
@@ -53,13 +80,26 @@ namespace WaterCloud.Service.OrderManagement
query = query.Where(a => a.F_Name.Contains(keyword)
|| a.F_ContactPerson.Contains(keyword));
}
if(!string.IsNullOrEmpty(id))
if (!string.IsNullOrEmpty(id))
{
query= query.Where(a=>a.F_Id==id);
query = query.Where(a => a.F_Id == id);
}
//权限过滤
query = GetDataPrivilege("a","",query);
return await query.ToPageListAsync(pagination);
query = GetDataPrivilege("a", "", query);
if (!(currentuser.IsAdmin || currentuser.IsBoss || currentuser.IsSuperAdmin || currentuser.IsSenior))
{
query = query.Where(oo => oo.F_CreatorUserId == currentuser.UserId);
}
var pageList = await query.ToPageListAsync(pagination);
var users = await UserService.GetUserList(string.Empty);
pageList.ForEach(item =>
{
var user = users.Find(oo => oo.F_Id == item.F_CreatorUserId);
item.F_CreatorUserId = user == null ? "未知用户" : user.F_RealName;
});
return pageList;
}
public async Task<OrderCustomerEntity> GetForm(string keyValue)
@@ -78,17 +118,23 @@ namespace WaterCloud.Service.OrderManagement
#region 提交数据
public async Task SubmitForm(OrderCustomerEntity entity, string keyValue)
{
if(string.IsNullOrEmpty(keyValue))
if (string.IsNullOrEmpty(keyValue))
{
//初始值添加
//初始值添加
entity.F_DeleteMark = false;
entity.Create();
await repository.Insert(entity);
}
else
{
//此处需修改
entity.Modify(keyValue);
if (!(currentuser.IsAdmin || currentuser.IsBoss || currentuser.IsSuperAdmin || currentuser.IsSenior) &&
currentuser.UserId != entity.F_CreatorUserId)
{
return;
}
//此处需修改
entity.Modify(keyValue);
await repository.Update(entity);
}
}
@@ -96,6 +142,18 @@ namespace WaterCloud.Service.OrderManagement
public async Task DeleteForm(string keyValue)
{
var ids = keyValue.Split(',');
foreach (var id in ids)
{
var data = await repository.FindEntity(id);
if (data == null)
return;
if (!(currentuser.IsAdmin || currentuser.IsBoss || currentuser.IsSuperAdmin || currentuser.IsSenior) &&
currentuser.UserId != data.F_CreatorUserId)
throw new Exception($"{data.F_Id} {data.F_Name}违规删除");
}
await repository.Delete(a => ids.Contains(a.F_Id.ToString()));
}
#endregion