From a9d26b7c151f2727c9dc06a8236f2cf45a765cda Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 17 五月 2024 08:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_jobSetingController.cs | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_jobSetingController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_jobSetingController.cs
index 73084b9..db91653 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_jobSetingController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_jobSetingController.cs
@@ -32,6 +32,8 @@
using SqlSugar;
using CoreCms.Net.Model.Entities.baifenbingfa.jon;
using CoreCms.Net.Web.Admin.Infrastructure;
+using CoreCms.Net.Services;
+using CoreCms.Net.Auth.HttpContextUser;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -47,16 +49,21 @@
{
private readonly IWebHostEnvironment _webHostEnvironment;
private readonly IJob_jobSetingServices _Job_jobSetingServices;
+ private readonly IHttpContextUser _user;
/// <summary>
/// 鏋勯�犲嚱鏁�
///</summary>
public Job_jobSetingController(IWebHostEnvironment webHostEnvironment
,IJob_jobSetingServices Job_jobSetingServices
+ ,ICoreCmsUserLogServices CoreCmsUserLogServices
+ ,IHttpContextUser User
)
{
_webHostEnvironment = webHostEnvironment;
_Job_jobSetingServices = Job_jobSetingServices;
+ _user = User;
+
}
#region 鑾峰彇鍒楄〃============================================================
@@ -138,6 +145,7 @@
{
where = where.And(p => p.isEN == false);
}
+ where=where.And(p=>p.isdelete == false);
//寤虹珛鏃堕棿 datetime
var createTime = Request.Form["createTime"].FirstOrDefault();
if (!string.IsNullOrEmpty(createTime))
@@ -250,6 +258,8 @@
[Description("鍒涘缓鎻愪氦")]
public async Task<AdminUiCallBack> DoCreate([FromBody]Job_jobSeting entity)
{
+ entity.createBy = _user?.Name??"绯荤粺鎴栬�呭叾浠�";
+ entity.createTime = DateTime.Now;
var jm = await _Job_jobSetingServices.InsertAsync(entity);
return jm;
}
@@ -292,7 +302,18 @@
[Description("缂栬緫鎻愪氦")]
public async Task<AdminUiCallBack> DoEdit([FromBody]Job_jobSeting entity)
{
- var jm = await _Job_jobSetingServices.UpdateAsync(entity);
+ entity.upDataBy = _user?.Name ?? "绯荤粺鎴栬�呭叾浠�";
+ entity.upDataTime = DateTime.Now;
+ var data = await _Job_jobSetingServices.QueryByIdAsync(entity.id);
+ data.upDataTime = DateTime.Now;
+ data.upDataBy = _user?.Name ?? "绯荤粺鎴栬�呭叾浠�";
+ data.position=entity.position;
+ data.quantity = entity.quantity;
+ data.isEN=entity.isEN;
+ data.jobDescription = entity.jobDescription;
+ data.requirements = entity.requirements;
+ data.location = entity.location;
+ var jm = await _Job_jobSetingServices.UpdateAsync(data);
return jm;
}
#endregion
--
Gitblit v1.9.1