|
@@ -103,26 +103,43 @@ namespace PMS.NetCore.Controllers
|
|
|
|
|
|
//去除重复的业主主键
|
|
|
var list1 = list.Where((x, i) => list.FindIndex(z => z.ownerid == x.ownerid) == i).ToList();
|
|
|
- var list2 = new List<string>();
|
|
|
- var owneridMsg = "";
|
|
|
- foreach (var dto in list1)
|
|
|
+ //var list2 = new List<string>();
|
|
|
+ //var owneridMsg = "";
|
|
|
+ //foreach (var dto in list1)
|
|
|
+ //{
|
|
|
+ // var index = list.IndexOf(dto);
|
|
|
+ // var entity = manager.GetById(dto.ownerid);
|
|
|
+ // if (entity != null)
|
|
|
+ // {
|
|
|
+ // owneridMsg += $"第{index + 1}条数据{dto.ownerid }业主编码已存在;";
|
|
|
+ // list2.Add(dto.ownerid);
|
|
|
+ // }
|
|
|
+
|
|
|
+ //}
|
|
|
+ //if(owneridMsg.IsNotNullAndEmpty())
|
|
|
+ //{
|
|
|
+ // return Json(owneridMsg);
|
|
|
+ //}
|
|
|
+ for(int i=list1.Count-1;i>=0;i--)
|
|
|
{
|
|
|
- var index = list.IndexOf(dto);
|
|
|
- var entity = manager.GetById(dto.ownerid);
|
|
|
- if (entity != null)
|
|
|
+ var entity = manager.GetById(list1[i].ownerid);
|
|
|
+ if(entity!=null)
|
|
|
{
|
|
|
- owneridMsg += $"第{index + 1}条数据{dto.ownerid }业主编码已存在;";
|
|
|
+ list1.Remove(list1[i]);
|
|
|
}
|
|
|
- list2.Add(dto.ownerid);
|
|
|
}
|
|
|
- if(owneridMsg.IsNotNullAndEmpty())
|
|
|
+
|
|
|
+ int row = 0;
|
|
|
+ if(list1.Count>0)
|
|
|
{
|
|
|
- return Json(owneridMsg);
|
|
|
+ //批量插入
|
|
|
+ row = manager.Db.Insertable(list1).ExecuteCommand();
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- //批量插入
|
|
|
- var row = manager.Db.Insertable(list1).ExecuteCommand();
|
|
|
+ else
|
|
|
+ {
|
|
|
+ row = 1;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
logger.Info($"【Fdc_pm_ownerAdd】row:{row}");
|