From 24c7242181f02ff6bb5e98ebd42c734aea120c13 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 20 五月 2024 15:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
index fa6d63b..feccc95 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
@@ -36,6 +36,7 @@
using SqlSugar.Extensions;
using NPOI.OpenXmlFormats.Spreadsheet;
using CoreCms.Net.Auth.HttpContextUser;
+using System.Collections.Generic;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -421,12 +422,21 @@
(job_EmploymentRecord.endDate.HasValue ? "-" + job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
+
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
return jm;
@@ -544,13 +554,19 @@
job_EmploymentRecord.startDatetxt = (job_EmploymentRecord.startDate.HasValue? job_EmploymentRecord.startDate.Value.ToString("yyyy/MM"):"") +
(job_EmploymentRecord.endDate.HasValue ? "-"+ job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
-
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
return jm;
--
Gitblit v1.9.1