|
@@ -1467,14 +1467,24 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
foreach (var item in _ivitiesViews)
|
|
foreach (var item in _ivitiesViews)
|
|
{
|
|
{
|
|
string delegationNameList = "";
|
|
string delegationNameList = "";
|
|
- string[] DelegationName = item.Delegation.Split(',');
|
|
|
|
- for (int i = 0; i < DelegationName.Length; i++)
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(item.Delegation))
|
|
{
|
|
{
|
|
- delegationNameList += _DelegationInfos.Find(it => it.Id == int.Parse(DelegationName[i]))?.TeamName ?? "Unknown" + ",";
|
|
|
|
- }
|
|
|
|
- if (!string.IsNullOrWhiteSpace(delegationNameList))
|
|
|
|
- {
|
|
|
|
- item.DelegationStr = delegationNameList.Substring(0, delegationNameList.Length - 1);
|
|
|
|
|
|
+ string[] DelegationName = item.Delegation.Split(',');
|
|
|
|
+ for (int i = 0; i < DelegationName.Length; i++)
|
|
|
|
+ {
|
|
|
|
+ string grpId = DelegationName[i];
|
|
|
|
+ if (!string.IsNullOrEmpty(grpId))
|
|
|
|
+ {
|
|
|
|
+ if (grpId.IsNumeric())
|
|
|
|
+ {
|
|
|
|
+ delegationNameList += _DelegationInfos.Find(it => it.Id == int.Parse(grpId))?.TeamName ?? "Unknown" + ",";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (!string.IsNullOrWhiteSpace(delegationNameList))
|
|
|
|
+ {
|
|
|
|
+ item.DelegationStr = delegationNameList.Substring(0, delegationNameList.Length - 1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|