wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

管理员领取用户

Browse Source
This commit is contained in:
“wanyongkang”
2023-08-11 15:11:13 +08:00
parent 4e27ed41ec
commit 9400508941
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Services/Hncore.Pass.BaseInfo/Service/ManageService.cs
View File

@@ -190,6 +190,7 @@ namespace Hncore.Pass.BaseInfo.Service
{"LoginName", manage.LoginCode}, {"LoginName", manage.LoginCode},
{"RoleName", ""}, {"RoleName", ""},
{"OperaterID", manage.Id}, {"OperaterID", manage.Id},
{"RealName", manage.RealName},
{"TenantId", manage.TenantId} {"TenantId", manage.TenantId}
}; };

2
Services/Hncore.Pass.BaseInfo/Service/UserService.cs
View File

@@ -211,7 +211,7 @@ namespace Hncore.Pass.BaseInfo.Service
entity = await this.Add(entity); entity = await this.Add(entity);
await RandomAssignManager(entity.Id); // await RandomAssignManager(entity.Id);
return new ApiResult(entity); return new ApiResult(entity);
} }

11
Services/Hncore.Pass.Manage/Controllers/ManagerController.cs
View File

@@ -131,7 +131,6 @@ namespace Hncore.Pass.Manage.Controllers
public async Task<ApiResult> GetOne([FromQuery] QueryByIdRequest param) public async Task<ApiResult> GetOne([FromQuery] QueryByIdRequest param)
{ {
param.TenantId = this.Request.GetManageUserInfo().TenantId;
return Success(await QueryItemManagerResponse.Query( return Success(await QueryItemManagerResponse.Query(
m_DbContext.Set<Manager>().GetQueryable() m_DbContext.Set<Manager>().GetQueryable()
, m_DbContext.Set<ManagerToPermission>().GetQueryable() , m_DbContext.Set<ManagerToPermission>().GetQueryable()
@@ -196,7 +195,7 @@ namespace Hncore.Pass.Manage.Controllers
///管理员权限表操作 ///管理员权限表操作
var search = m_DbContext.Set<ManagerToPermission>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId && p.TenantId == param.TenantId); var search = m_DbContext.Set<ManagerToPermission>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId);
foreach (var item in search) foreach (var item in search)
{ {
ManagerToPermission mp = new ManagerToPermission(); ManagerToPermission mp = new ManagerToPermission();
@@ -212,15 +211,15 @@ namespace Hncore.Pass.Manage.Controllers
mp.CreatorId = param.OperaterId; mp.CreatorId = param.OperaterId;
m_DbContext.Set<ManagerToPermission>().Add(mp); m_DbContext.Set<ManagerToPermission>().Add(mp);
} }
var del = m_DbContext.Set<ManagerToPermission>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id && p.TenantId == param.TenantId).ToList(); var del = m_DbContext.Set<ManagerToPermission>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id).ToList();
m_DbContext.Set<ManagerToPermission>().RemoveRange(del); m_DbContext.Set<ManagerToPermission>().RemoveRange(del);
//被转移人项目 //被转移人项目
var recipientProject = m_DbContext.Set<AuthorityManagerDataDomain>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id && p.TenantId == param.TenantId); var recipientProject = m_DbContext.Set<AuthorityManagerDataDomain>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id);
//我的项目 //我的项目
var myProject = m_DbContext.Set<AuthorityManagerDataDomain>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId && p.TenantId == param.TenantId); var myProject = m_DbContext.Set<AuthorityManagerDataDomain>().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId);
foreach (var item in recipientProject) foreach (var item in recipientProject)
{ {
item.DeleteTag = 1; item.DeleteTag = 1;
@@ -276,7 +275,7 @@ namespace Hncore.Pass.Manage.Controllers
[HttpGet] [HttpGet]
public async Task<ApiResult> GetAdminPhoneByManageId([FromQuery] QueryByIdRequest param) public async Task<ApiResult> GetAdminPhoneByManageId([FromQuery] QueryByIdRequest param)
{ {
var result = m_DbContext.Set<Manager>().GetQueryable().Where(p => p.TenantId == param.TenantId && p.IsRoot == true).ToList(); var result = m_DbContext.Set<Manager>().GetQueryable().Where(p => p.IsRoot == true).ToList();
if (result != null && result.Count() > 0) return Success<string>(result[0].Phone); if (result != null && result.Count() > 0) return Success<string>(result[0].Phone);
return Success<string>(""); return Success<string>("");

2
Services/Hncore.Pass.Manage/Response/Manager/QueryItemManagerResponse.cs
View File

@@ -82,7 +82,7 @@ namespace Hncore.Pass.Manage.Response
, QueryByIdRequest param , QueryByIdRequest param
) )
{ {
var search = from dw in ManagerQueryable.Where(p => p.DeleteTag == 0 && p.Id == param.Id && p.TenantId == param.TenantId) var search = from dw in ManagerQueryable.Where(p => p.DeleteTag == 0 && p.Id == param.Id)
join mtp in ManagerToPermissionQueryable.Where(p => p.DeleteTag == 0) join mtp in ManagerToPermissionQueryable.Where(p => p.DeleteTag == 0)
on dw.Id equals mtp.ManagerId into Permissions on dw.Id equals mtp.ManagerId into Permissions
select new { dw, Permissions }; select new { dw, Permissions };

2
Services/Hncore.Pass.Manage/Service/ManagerService.cs
View File

@@ -55,7 +55,7 @@ namespace Hncore.Pass.Manage.Service
}else }else
{ {
managers = m_DbContext.Set<Manager>().GetQueryable().Where(m => m.TenantId == request.TenantId && m.DeleteTag == 0); managers = m_DbContext.Set<Manager>().GetQueryable().Where(m => m.DeleteTag == 0);
//是否过滤超级管理员 //是否过滤超级管理员
if (request.IsRoot == 1) if (request.IsRoot == 1)
managers = managers.Where(m => m.IsRoot == false); managers = managers.Where(m => m.IsRoot == false);

14
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -320,11 +320,11 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
price = 1.00M; price = 1.00M;
} }
if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ // if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){
// price = 0.1M; // // price = 0.1M;
userEntity.ProductAccountCount = 1; // userEntity.ProductAccountCount = 1;
await m_UserService.Update(userEntity); // await m_UserService.Update(userEntity);
} // }
var order = new ProductOrderEntity() var order = new ProductOrderEntity()
{ {
AccountCount = 1, AccountCount = 1,
@@ -622,6 +622,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
accounts = accounts.Distinct().ToList(); accounts = accounts.Distinct().ToList();
var userEntity = await m_UserService.GetById(order.UserId); var userEntity = await m_UserService.GetById(order.UserId);
var user_remark = ""; var user_remark = "";
if(order.ProductId == 8||order.ProductId == 7) { if(order.ProductId == 8||order.ProductId == 7) {
@@ -637,6 +638,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
var end_time = DateTime.Now.AddDays(order.DayCount); var end_time = DateTime.Now.AddDays(order.DayCount);
if (order.PackageName == "测试卡" || order.PackageName == "测试卡(高级)" || order.PackageName == "测试卡(普通)") { if (order.PackageName == "测试卡" || order.PackageName == "测试卡(高级)" || order.PackageName == "测试卡(普通)") {
end_time = DateTime.Now.AddHours(order.DayCount); end_time = DateTime.Now.AddHours(order.DayCount);
userEntity.ProductAccountCount = 1;
} }
@@ -838,6 +840,8 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
} }
userEntity.pay_time = DateTime.Now.ToString();
await m_UserService.Update(userEntity);
} }
/// <summary> /// <summary>