yanjinhui
2025-06-07 9250e3e48760f91fbefef03331fc7b14b4b1be18
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