Merge branch 'development'

Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPositionItem.cs

@@ -25,7 +25,7 @@
         /// <summary>
         /// 岗位名称
         /// </summary>
-        public string ZJOBANME { get; set; }
+        public string ZJOBNAME { get; set; }
 
         /// <summary>
         /// 

Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPositionJob.cs

@@ -1,9 +1,7 @@
 using Dlhis.Entity.Basic.Entity;
-using Dlhis.ScheduledTask.SyncSapInfo.Comparers;
 using Dlhis.ScheduledTask.SyncSapInfo.Dto;
 using Dlhis.ScheduledTask.SyncSapInfo.Services;
 using Kurisu.SqlSugar.Services;
-using Mapster;
 
 namespace Dlhis.ScheduledTask.SyncSapInfo.Job;
 
@@ -12,7 +10,6 @@ namespace Dlhis.ScheduledTask.SyncSapInfo.Job;
 /// </summary>
 public class SyncPositionJob
 {
-    private List<SapPositionItem> lastUpdatedPositionList = new List<SapPositionItem>();
     private readonly IDbContext _dbContext;
     private readonly IJinkoSapService _jinkoSapService;
 
@@ -28,25 +25,12 @@ public class SyncPositionJob
 
         if (positionResult.Position != null && positionResult.Position.Items.Count > 0)
         {
-            var modifiedOrgList = GetModifiedPosition(positionResult.Position.Items);
-            await SaveOrg(modifiedOrgList);
+            await SaveOrg(positionResult.Position.Items);
         }
     }
 
-    private List<SapPositionItem> GetModifiedPosition(List<SapPositionItem> spaList)
-    {
-        if (lastUpdatedPositionList.Count <= 0)
-        {
-            return spaList;
-        }
-        var needRemove = spaList.Intersect(lastUpdatedPositionList, new SapPositionComparer());
-        return spaList.Except(needRemove, new SapPositionComparer()).ToList();
-    }
-
     private async Task SaveOrg(List<SapPositionItem> modifiedPostList)
     {
-        if (modifiedPostList == null || modifiedPostList.Count == 0) return;
-
         var addItems = new List<PositionEntity>();
         var updateItems = new List<PositionEntity>();
 
@@ -57,8 +41,8 @@ public class SyncPositionJob
             {
                 position = new PositionEntity
                 {
-                    No = item.ZJOBANME,
-                    Name = item.ZJOBANME,
+                    No = item.ZDEPID,
+                    Name = item.ZJOBNAME,
                     DepartmentNo = item.ZDEPID,
                     Grade = item.ZZWID
                 };
@@ -67,7 +51,7 @@ public class SyncPositionJob
             }
             else
             {
-                position.Name = item.ZJOBANME;
+                position.Name = item.ZJOBNAME;
                 position.DepartmentNo = item.ZDEPID;
                 position.Grade = item.ZZWID;