diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index de0945c2..3c15b020 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -55,8 +55,8 @@ namespace BLL QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType), ResponsibleMan = x.ResponsibleMan, - ReceiveMan = x.ReceiveMan - + ReceiveMan = x.ReceiveMan, + ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan) }; return getInfo.FirstOrDefault(); @@ -97,8 +97,8 @@ namespace BLL QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType), ResponsibleMan = x.ResponsibleMan, - ReceiveMan = x.ReceiveMan - + ReceiveMan = x.ReceiveMan, + ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan) }; return getInfo.FirstOrDefault(); @@ -122,7 +122,7 @@ namespace BLL var getCheckSpecial = from x in db.Check_CheckSpecial where x.ProjectId == projectId && x.States ==states //当前保存人、审核人、确认人能看到 - &&(x.CompileMan==userid || x.ResponsibleMan==userid || userid.Contains(x.ReceiveMan)) + &&(x.CompileMan==userid || x.ResponsibleMan==userid || userid.Split(',').Contains(x.ReceiveMan)) orderby x.CheckSpecialCode descending select new Model.CheckSpecialItem { @@ -146,7 +146,8 @@ namespace BLL CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName, States = x.States, AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null), - ReceiveMan=x.ResponsibleMan + ReceiveMan=x.ReceiveMan, + ReceiveManName= UserService.getUserNamesUserIds(x.ReceiveMan) }; return getCheckSpecial.ToList(); } @@ -185,7 +186,8 @@ namespace BLL WorkAreaId=newItem.WorkAreaId, QuestionType=newItem.QuestionType, //审核人 - ResponsibleMan=newItem.ResponsibleMan + ResponsibleMan=newItem.ResponsibleMan, + ReceiveMan=newItem.ReceiveMan }; //if (newItem.States != Const.State_1) //{ diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs index 69814a79..0bcae846 100644 --- a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs +++ b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs @@ -245,5 +245,6 @@ namespace Model /// public string ReceiveMan { get; set; } + public string ReceiveManName { get; set; } } }