|
@@ -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;
|
|
|
}
|