|
@@ -2365,17 +2365,16 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
*/
|
|
|
|
|
|
string taskStr = string.Empty ;
|
|
|
- List<string> countrys = obDatas.Select(it => it.Country).ToList();
|
|
|
+ List<string> countrys = obDatas.Where(it => !string.IsNullOrEmpty(it.Country)).Select(it => it.Country).ToList();
|
|
|
int countryIndex = 1;
|
|
|
foreach (var item in countrys)
|
|
|
{
|
|
|
-
|
|
|
string taskTitle = $"({GetToUpperNumber(countryIndex)}){item ?? "[公务出访国家未填写]"}\r\n";
|
|
|
|
|
|
string taskContent = "";
|
|
|
if (!string.IsNullOrEmpty(item))
|
|
|
{
|
|
|
- var countryObDatas = obDatas.Where(it => it.Country.Contains(item)).OrderBy(it => it.Date).ToList();
|
|
|
+ var countryObDatas = obDatas.Where(it => !string.IsNullOrEmpty(it.Country) && it.Country.Contains(item)).OrderBy(it => it.Date).ToList();
|
|
|
int obIndex = 1;
|
|
|
if (countryObDatas.Count == 0) taskContent = "[公务出访未录入]\r\n";
|
|
|
else
|