修改bug

yanjinhui

5 天以前 0bc66c82a07c1b46a98ba7007b0a672fec02176e

修改bug

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs

@@ -103,7 +103,7 @@
        public WebResponseContent StartMaintenceTask(string account)
        {
            var userIp = HttpContext.GetUserIp();//用户电脑ip
            var reslut = userIp.Replace("::ffff:", "");
            var reslut = userIp.Replace("::ffff:","");
            return Service.StartMaintenceTask(account, userIp);
        }

@@ -117,7 +117,7 @@
        public WebResponseContent StopMaintenanceTask(string account)
        {
            var userIp = HttpContext.GetUserIp();//用户电脑ip
            var reslut = userIp.Replace("::ffff:", "");
            var reslut = userIp.Replace("::ffff:","");
            return Service.StopMaintenanceTask(account, userIp);
        }


 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs

@@ -86,6 +86,7 @@
                    a.UserTrueName,
                    a.Userteam,
                    a.HeadImageUrl,
                    b.ID,
                    b.LoginTiem,
                    b.OutTiem,
                    b.OpCenten,

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs

@@ -630,8 +630,8 @@
                //{
                //    return new WebResponseContent { Status = false, Message = "操作设备不同，请回到原本设备再点击结束检修" };
                //}
                var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""
                var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
                var addressIp = "";
                if (address != null) //找到了
                {

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs

@@ -75,14 +75,14 @@

                        //"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),

                        _ => query.OrderByDescending((a, b) => b.Creater), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                        _ => query.OrderByDescending((a, b) => b.CreateDate), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                    };

                }
                else
                {
                    //默认按创建时间降序排序
                    query = query.OrderByDescending((a, b) => b.Creater);
                    query = query.OrderByDescending((a, b) => b.CreateDate);
                }

                //// å¦‚果不是管理员，根据部门过滤
@@ -107,12 +107,14 @@
                var result=query
                .Select((a, b) => new
                {
                    a.User_Id,
                   
                    //a.User_Id,
                    a.Dept_Id,//轨道站
                    a.IsLeader,//是否是班长
                    a.Role_Id,
                    a.RoleName,//角色名称
                    a.Unit,//单位
                    b.ID,
                    b.IPAddress,//电脑ip地址
                    b.OperatorName,//姓名
                    b.TeamName,//班组

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs

@@ -84,6 +84,7 @@
                    a.UserTrueName,
                    a.Userteam,
                    a.HeadImageUrl,
                    b.ID,
                    b.LoginTiem,
                    b.OutTiem,
                    b.OpCenten,

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs

@@ -72,14 +72,14 @@

                        //"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),

                        _ => query.OrderByDescending((a, b) => b.Creater), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                        _ => query.OrderByDescending((a, b) => b.CreateDate), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                    };

                }
                else
                {
                    //默认按创建时间降序排序
                    query = query.OrderByDescending((a, b) => b.Creater);
                    query = query.OrderByDescending((a, b) => b.CreateDate);
                }

                //// å¦‚果不是管理员，根据部门过滤
@@ -104,6 +104,7 @@
                var result = query
                .Select((a, b) => new
                {
                    b.ID,
                    a.User_Id,
                    a.Dept_Id,//轨道站
                    a.IsLeader,//是否是班长