From 9250e3e48760f91fbefef03331fc7b14b4b1be18 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 07 六月 2025 13:09:59 +0800
Subject: [PATCH] 修改数字大屏接口
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
index 9b0a9f5..54adc25 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -16,15 +16,17 @@
{
public IRepository<Dt_MaintenanceTeam> Repository => BaseDal;
private readonly IRepository<Sys_User> _user;
+
- public MaintenanceTeamService(IRepository<Dt_MaintenanceTeam> BaseDal,IRepository<Sys_User> user) : base(BaseDal)
+ public MaintenanceTeamService(IRepository<Dt_MaintenanceTeam> BaseDal,IRepository<Sys_User> user, IRepository<Dt_Maintenance> mainServer) : base(BaseDal)
{
_user = user;
+
}
/// <summary>
- /// 妫�淇缃褰�
+ /// 妫�淇缃褰�
/// </summary>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
@@ -78,22 +80,22 @@
query = query.OrderByDescending((a, b) => b.Creater);
}
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
- if (pagination.account != "admin")
- {
- var currentUser = _user.Db.Queryable<Sys_User>()
- .Where(u => u.UserName == pagination.account)
- .First();
+ //// 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
+ //if (pagination.account != "admin")
+ //{
+ // var currentUser = _user.Db.Queryable<Sys_User>()
+ // .Where(u => u.UserName == pagination.account)
+ // .First();
- if (currentUser == null)
- {
- return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
- }
+ // if (currentUser == null)
+ // {
+ // return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
+ // }
- int? deptId = currentUser.Dept_Id;
+ // int? deptId = currentUser.Dept_Id;
- query = query.Where((a, b) => a.Dept_Id == deptId);
- }
+ // query = query.Where((a, b) => a.Dept_Id == deptId);
+ //}
//杩斿洖缁撴灉
@@ -101,10 +103,17 @@
.Select((a, b) => new
{
a.User_Id,
+ a.Dept_Id,//杞ㄩ亾绔�
+ a.IsLeader,//鏄惁鏄彮闀�
+ a.RoleName,
+ a.Role_Id,
+ b.IPAddress,//鐢佃剳ip鍦板潃
b.OperatorName,
b.TeamName,
+ b.Creater,
a.HeadImageUrl,
b.DistributionTime,
+ b.EndTime,
b.Modifier,
}).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
return new WebResponseContent
--
Gitblit v1.9.3