接团客户名单 下载名单 增加 公司验证

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11052,7 +11052,12 @@ namespace OASystem.API.Controllers
                     builder.Write(birthDayStr);
 
                     builder.MoveToCell(0, i + 1, 3, 0);
-                    builder.Write(DcList[i].CompanyFullName);
+                    string company = "";
+                    if (!string.IsNullOrEmpty(DcList[i].CompanyFullName))
+                    {
+                        company = DcList[i].CompanyFullName.ToString();
+                    }
+                    builder.Write(company);
 
                     builder.MoveToCell(0, i + 1, 4, 0);
                     builder.Write(DcList[i].Job);
@@ -11096,7 +11101,7 @@ namespace OASystem.API.Controllers
                     string company = "";
                     try
                     {
-                        if (!string.IsNullOrEmpty(DcList[i].CompanyFullName.ToString()))
+                        if (!string.IsNullOrEmpty(DcList[i].CompanyFullName))
                         {
                             //查询对照表
                             Res_CompanyEnglishComparison tempCec = listCEC.FirstOrDefault(s => s.zhName.Contains(DcList[i].CompanyFullName.ToString().Trim()));

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1619,20 +1619,13 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryOfficialActivitiesByDiId(OfficialActivitiesByDiIdDto dto)
         {
-            try
+            Result groupData = await _officialActivitiesRep.QueryOfficialActivitiesByDiId(dto);
+            if (groupData.Code != 0)
             {
-                Result groupData = await _officialActivitiesRep.QueryOfficialActivitiesByDiId(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, groupData.Msg));
             }
+            return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            
         }
         /// <summary>
         /// 根据公务出访数据Id查询数据
@@ -2000,9 +1993,9 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                     builder.MoveToCell(0, i + 1, 3, 0);
                     string birthDay = "";
                     string birthDayStr = string.Empty;
-                    if (!string.IsNullOrEmpty(birthDay))
+                    if (guestInfo.BirthDay != null)
                     {
-                        birthDayStr = Convert.ToDateTime(birthDay).ToString("yyyy.MM");
+                        birthDayStr = guestInfo.BirthDay.ToString("yyyy.MM");
                     }
                     builder.Write(birthDayStr);
                 }