diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
index f831091..90248d2 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
@@ -151,7 +151,7 @@ namespace TaskManager.Controllers
return;
}
var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName) && p.WriteState == false && p.Subscriber == client ).ToList();
- int pageSize = ;
+ int pageSize = 10;
if (!sublist.Any())
{
foreach (var sub in sublist)
diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs
index 00190e7..cf32cb6 100644
--- a/API/Wood.Service/Controllers/NormalBaseController.cs
+++ b/API/Wood.Service/Controllers/NormalBaseController.cs
@@ -74,17 +74,23 @@ namespace Wood.Service.Controllers
///
///
///
- [HttpPut("{id}")]
- public async virtual Task Update(long UId, T entity)
+ [HttpPut]
+ [Route("Update/{UId}")]
+ public async virtual Task Update(T entity)
{
- var _first = await _repository.GetByIdAsync(UId);
+ if (entity.UId == 0)
+ {
+ throw new Exception("更新时,实体主键UId不能为空或0");
+ }
+ var _first = await _repository.GetByIdAsync(entity.UId);
if (_first == null)
{
+ throw new Exception($"NormalBaseController.Update报错:根据UId{entity.UId}没有找到记录");
return new JsonResult(new { Code = 400, Message = "修改失败!" });
}
EntityMapper.Trans(_first, entity, "UId");
- await _repository.UpdateAsync(entity);
+ await _repository.UpdateAsync(_first);
return new JsonResult(new { Code = 200, Message = "修改成功!" });
}
///
@@ -313,6 +319,7 @@ namespace Wood.Service.Controllers
}
catch (Exception ex)
{
+ throw new Exception("NormalBaseController.Import报错:" + ex.Message);
// await _logger.AddError(ex.Message, TaskName);
return new JsonResult(new { Code = 400, Message = "导入失败!" });
}
diff --git a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs
index e023705..96e2daf 100644
--- a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs
+++ b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs
@@ -106,7 +106,7 @@ namespace Wood.Service.Datas
{
empDtObj.UId = firstObj.UId;
empDtObj.CreationTime = CommonHelper.CurrentTime;
- var ret = await base.Update(firstObj.UId, empDtObj);
+ var ret = await base.Update(empDtObj);
}
}
#endregion
@@ -163,7 +163,7 @@ namespace Wood.Service.Datas
}
}
- public override async Task Update(long UId, SUPPLIER_EMPLOYEE_DT entity)
+ public override async Task Update(SUPPLIER_EMPLOYEE_DT entity)
{
using var transaction = _context.Database.BeginTransaction();
try
@@ -191,7 +191,7 @@ namespace Wood.Service.Datas
}
else
{
- var ret = await base.Update(firstObj.UId, entity);
+ var ret = await base.Update(entity);
}
#endregion
diff --git a/API/Wood.Service/Datas/SupplierInfoDtService.cs b/API/Wood.Service/Datas/SupplierInfoDtService.cs
index 347f98a..916b1e0 100644
--- a/API/Wood.Service/Datas/SupplierInfoDtService.cs
+++ b/API/Wood.Service/Datas/SupplierInfoDtService.cs
@@ -104,7 +104,7 @@ namespace Wood.Service.Datas
{
empDtObj.UId = firstObj.UId;
empDtObj.CreationTime = CommonHelper.CurrentTime;
- var ret = await base.Update(firstObj.UId, empDtObj);
+ var ret = await base.Update(empDtObj);
}
}
#endregion
@@ -162,7 +162,7 @@ namespace Wood.Service.Datas
}
}
- public override async Task Update(long UId, SUPPLIER_INFO_DT entity)
+ public override async Task Update(SUPPLIER_INFO_DT entity)
{
using var transaction = _context.Database.BeginTransaction();
try
@@ -189,7 +189,7 @@ namespace Wood.Service.Datas
}
else
{
- var ret = await base.Update(firstObj.UId, entity);
+ var ret = await base.Update(entity);
}
#endregion
diff --git a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs
index c3ad5cf..a7ffca2 100644
--- a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs
+++ b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs
@@ -104,7 +104,7 @@ namespace Wood.Service.Datas
{
empDtObj.UId = firstObj.UId;
empDtObj.CreationTime = CommonHelper.CurrentTime;
- var ret = await base.Update(firstObj.UId, empDtObj);
+ var ret = await base.Update(empDtObj);
}
}
#endregion
@@ -159,7 +159,7 @@ namespace Wood.Service.Datas
}
}
- public override async Task Update(long UId, SUPPLIER_PRO_PROCESS_EQUIPMENT_DT entity)
+ public override async Task Update(SUPPLIER_PRO_PROCESS_EQUIPMENT_DT entity)
{
using var transaction = _context.Database.BeginTransaction();
try
@@ -185,7 +185,7 @@ namespace Wood.Service.Datas
}
else
{
- var ret = await base.Update(firstObj.UId, entity);
+ var ret = await base.Update(entity);
}
#endregion