yuanrf 5 päivää sitten
vanhempi
commit
59e83b3254
1 muutettua tiedostoa jossa 7 lisäystä ja 3 poistoa
  1. 7 3
      OASystem/OASystem.Api/Controllers/GroupsController.cs

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

@@ -26498,7 +26498,7 @@ ORDER BY
                 else
                 {
                     _sqlSugar.Updateable<Grp_ConferenceAffairsCost>(data)
-                        .IgnoreColumns(ignoreAllNullColumns: true)
+                        .IgnoreColumns(x => new { x.Id })
                         .ExecuteCommand();
                     data.Id = data.Id;
                 }
@@ -26513,7 +26513,7 @@ ORDER BY
 
                     var inrsetCount = insertArr.Any() ? _sqlSugar.Insertable<Grp_ConferenceAffairsCostChild>(insertArr).ExecuteCommand() : 0;
                     var updateCount = updateArr.Any() ? _sqlSugar.Updateable<Grp_ConferenceAffairsCostChild>(updateArr)
-                        .IgnoreColumns(ignoreAllNullColumns: true)
+                        .IgnoreColumns(x=> new { x.ConferenceAffairsCostId, x.Id,})
                         .ExecuteCommand() : 0;
                 }
 
@@ -26611,7 +26611,11 @@ ORDER BY
         [HttpPost]
         public async Task<IActionResult> ConferenceAffairSinglesDelete(ConferenceAffairsDeleteSingleDto Dto)
         {
-           var count = _sqlSugar.Updateable<Grp_ConferenceAffairsCostChild>()
+            var isAudit = _sqlSugar.Queryable<Grp_ConferenceAffairsCostChild>().Where(x => x.IsDel == 0 && Dto.ids.Contains(x.Id))
+                .Any(x => x.ReviewStatus == 1);
+            if (isAudit) return Ok(JsonView(false, "包含已审核数据无法删除!"));
+
+            var count = _sqlSugar.Updateable<Grp_ConferenceAffairsCostChild>()
                        .Where(x => Dto.ids.Contains(x.Id) && x.IsDel == 0)
                        .SetColumns(x => new Grp_ConferenceAffairsCostChild
                        {