1
This commit is contained in:
parent
b58d616897
commit
5e4c26e681
@ -13550,7 +13550,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
emeList.Add(co[1]);
|
emeList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -13596,7 +13596,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
typeList.Add(co[1]);
|
typeList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -13642,7 +13642,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
departList.Add(co[1]);
|
departList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -13688,7 +13688,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
postList.Add(co[1]);
|
postList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -14435,7 +14435,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
mesList.Add(co[1]);
|
mesList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -14481,7 +14481,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
emeList.Add(co[1]);
|
emeList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -14527,7 +14527,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
typeList.Add(co[1]);
|
typeList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -14574,7 +14574,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
departList.Add(co[1]);
|
departList.Add(co[1]);
|
||||||
}
|
}
|
||||||
@ -14621,7 +14621,7 @@ namespace APT.BaseData.Services.DomainServices
|
|||||||
if (c.Contains("、"))
|
if (c.Contains("、"))
|
||||||
{
|
{
|
||||||
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
var co = c.Split(new[] { '、' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
if (co.Length > 0)
|
if (co.Length > 2)
|
||||||
{
|
{
|
||||||
postList.Add(co[1]);
|
postList.Add(co[1]);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -200,10 +200,10 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
|
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
|
||||||
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
|
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
|
||||||
{
|
{
|
||||||
if (departList.Where(t => t.IS_DELETED == false).Count() == 0)
|
//if (departList.Where(t => t.IS_DELETED == false).Count() == 0)
|
||||||
{
|
//{
|
||||||
throw new Exception("管控层级不能为空");
|
// throw new Exception("管控层级不能为空");
|
||||||
}
|
//}
|
||||||
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
|
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
|
||||||
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
|
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
|
||||||
entity.STATUS = PFStandardStatus.Approving;
|
entity.STATUS = PFStandardStatus.Approving;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user