diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs index 179ea67..42b71f5 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs @@ -789,7 +789,7 @@ namespace APT.BS.WebApi.Controllers.Api Msg = "未获取到导入数据"; throw new Exception(Msg); } - List listNotEmpty = new List() { 0, 7, 8, 9, 12, 16 }; + List listNotEmpty = new List() { 0, 7, 8, 9, 12 };//, 16 //使用组织 T_FM_DEPARTMENT //物料类型 T_TI_SAFE_PDT_COST_RECORD_TYPE T_TI_COST_TYPE @@ -907,9 +907,9 @@ namespace APT.BS.WebApi.Controllers.Api List listApproveRoleIndex = new List(); //操作角色 16 - string strRole = string.Empty; + //string strRole = string.Empty; char[] charSplit = new char[] { ';', ';' }; - List listStrRole = new List(); + List listStrRole = new List() { "App用户" };//操作角色列删除 配置默认角色 “App用户” List listRoleItem = new List(); List listRoleName = new List(); List listRoleIndex = new List(); @@ -988,7 +988,7 @@ namespace APT.BS.WebApi.Controllers.Api #region 不能为空 List listi = null; - for (int j = 0; j < 17; j++) + for (int j = 0; j < 16; j++)//17 { if (!listNotEmpty.Contains(j)) continue; @@ -1293,22 +1293,22 @@ namespace APT.BS.WebApi.Controllers.Api else { modelApproveRole = null; - } - + } + #endregion - + #region 操作角色 16 - - strRole = dtSource.Rows[i][16].ToString().Trim(); - if (!string.IsNullOrEmpty(strRole)) - { - listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList(); - listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList(); - } - else - { - listRoleItem = null; - } + + //strRole = dtSource.Rows[i][16].ToString().Trim(); + //if (!string.IsNullOrEmpty(strRole)) + //{ + // listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList(); + listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList(); + //} + //else + //{ + // listRoleItem = null; + //} #endregion diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs index 41d5445..3f4285d 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs @@ -83,12 +83,12 @@ namespace APT.SC.WebApi.Controllers.Api.SE List Nav_Demands = null; List noticeTask = null; - var listUserID = Demands.Where(e => e.USER_ID.HasValue).Select(e => e.USER_ID.Value); + var listUserID = Demands.Where(e => !e.IS_DELETED && e.USER_ID.HasValue).Select(e => e.USER_ID.Value); var listUserIDCheck = listUserID.Distinct(); var ccCheck = listUserID.Count() - listUserIDCheck.Count(); if (ccCheck > 0) { - throw new Exception("调查人员不能重复("+ ccCheck + "人)!"); + throw new Exception("调查人员不能重复(" + ccCheck + "人)!"); } if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) {