Browse Source

部分细节修改

yuanrf 8 months ago
parent
commit
e6b92d757f

+ 3 - 1
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6765,6 +6765,8 @@ namespace OASystem.API.Controllers
         public IActionResult ExportTravel(ExportTravelDto dto)
         {
             var jw = JsonView(false);
+            jw.Data = "";
+
             int diid = 0;
             var Find = _sqlSugar.Queryable<Grp_DelegationInfo>().First(x => x.Id == dto.Diid);
             if (Find == null)
@@ -12892,7 +12894,7 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                     {
                         Grp_ApprovalTravelDetails chi = new Grp_ApprovalTravelDetails();
                         chi.Details = "拜访" + item.Client;
-                        if (string.IsNullOrWhiteSpace(item.ReqSample))
+                        if (!string.IsNullOrWhiteSpace(item.ReqSample))
                         {
                             chi.Details += "," + item.ReqSample;
                         }

+ 1 - 1
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1860,7 +1860,7 @@ namespace OASystem.API.OAMethodLib
                                 //日
                                 int day = Convert.ToInt32(Info[1].Substring(2, 2));
 
-                                var time = new DateTime(2023, month, day); //
+                                var time = new DateTime(DateTime.Now.Year, month, day); //
 
                                 var isExist = Info.Contains("[中转]");