diff --git a/APT.BaseData.Domain/Entities/FM/T_FM_SYNC_TASK.cs b/APT.BaseData.Domain/Entities/FM/T_FM_SYNC_TASK.cs index c5d413f..762b199 100644 --- a/APT.BaseData.Domain/Entities/FM/T_FM_SYNC_TASK.cs +++ b/APT.BaseData.Domain/Entities/FM/T_FM_SYNC_TASK.cs @@ -20,7 +20,6 @@ namespace APT.BaseData.Domain.Entities.FM /// 同步名称 /// [Description("同步名称")] - [AcronymField("NAME_ACRONYM")] public string NAME { get; set; } /// diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index cc5723e..e750d25 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -5593,7 +5593,6 @@ namespace APT.BS.WebApi.Controllers.Api { return SafeExecute(() => { - var files = entity.Nav_Files; entity.Nav_Files = null; //entity.RiskContentState 5 10 需要处理 diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs index 99b3096..660d085 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs @@ -384,7 +384,7 @@ namespace APT.BS.WebApi.Controllers.Api userModelNotice = GetEntity(listContent[0].USER_ID.Value); } var userModel = GetDepartMentLevelMaster(userModelNotice);//隐患通知责任人 - if (userModel != null && userModel.ID != Guid.Empty) + if (userModel != null && !string.IsNullOrEmpty(userModel.NAME)) { dicApproveUser.Add(3, userModel);//隐患通知责任人 所在的部门级别负责人 } diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs index 784f07d..e9c3729 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -4225,7 +4225,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController ret.TotalCount = newData.Count(); ret.doneCount = newData.Where(t => t.NOTICE_STATUS == 1).Count(); ret.timeOverCount = newData.Where(t => t.NOTICE_STATUS == 2).Count(); - var groupDataTemp = newData.GroupBy(t =>t.MOUDLE_NAME).Select(m => new GroupbyMouldName + var groupDataTemp = newData.GroupBy(t => t.MOUDLE_NAME).Select(m => new GroupbyMouldName { mouldName = m.Key, totalCount = m.Count(p => p.MOUDLE_NAME == m.Key), @@ -4234,6 +4234,16 @@ namespace APT.SC.WebApi.Controllers.Api.BIController }).ToList(); ret.groupData = groupDataTemp; } + else + { + ret.formData = formInfo.ToList(); + ret.userData = userInfos.ToList(); + ret.newData = new List(); + ret.TotalCount = 0; + ret.doneCount = 0; + ret.timeOverCount = 0; + ret.groupData = new List(); + } return ret; }); }