Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1917,6 +1917,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
 
                         taskContent += $"{obIndex}. {reqSmaple}\r\n";
                         obBackgroundContent += $"{obIndex}. {obInfo.Client}：{settingStr}\r\n";
+                        obIndex++;
                     }
 
                     taskStr += $"{taskTitle}{taskContent}";
@@ -2106,18 +2107,20 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                     string taskTitle = $"（{GetToUpperNumber(countryIndex)}）{item ?? "[公务出访国家未填写]"}\r\n";
 
                     string taskContent = "";
-                    var countryObDatas = obDatas.Where(it => it.Country.Contains(item)).OrderBy(it => it.Date).ToList();
-                    int obIndex = 1;
-                    if (countryObDatas.Count == 0) taskContent = "[公务出访未录入]\r\n";
-                    else
+                    if (!string.IsNullOrEmpty(item))
                     {
-                        foreach (var obInfo in countryObDatas)
+                        var countryObDatas = obDatas.Where(it => it.Country.Contains(item)).OrderBy(it => it.Date).ToList();
+                        int obIndex = 1;
+                        if (countryObDatas.Count == 0) taskContent = "[公务出访未录入]\r\n";
+                        else
                         {
-                            taskContent += $"{obIndex}.{obInfo.ReqSample ?? "[公务出访请示范例未填写]"}\r\n背景：{obInfo.Setting ?? "[公务出访背景未填写]"}\r\n";
+                            foreach (var obInfo in countryObDatas)
+                            {
+                                taskContent += $"{obIndex}.{obInfo.ReqSample ?? "[公务出访请示范例未填写]"}\r\n背景：{obInfo.Setting ?? "[公务出访背景未填写]"}\r\n";
+                                obIndex++;
+                            }
                         }
                     }
-                    
-
                     taskStr += $"{taskTitle}{taskContent}";
 
                     countryIndex++;

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1469,6 +1469,8 @@ namespace OASystem.API.OAMethodLib
                 }
                 cityCodes = cityCodes.Distinct().ToList();
 
+                if (cityCodes.Count > 0) countryStr = "";
+
                 foreach (var item in cityCodes)
                 {
                     var airData = airDatas.Where(it => it.Three.Contains(item)).ToList();