diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
index 03cd1979d..e8b65d616 100644
--- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
+++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
@@ -104,8 +104,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
         List<Map<String, String>> list = new ArrayList<>();
         try {
             Map<String, Object> paramsMap = new HashMap<String, Object>();
-//        paramsMap.put("pageIndex", 1);
-//        paramsMap.put("pageSize", 500);
+            paramsMap.put("pageIndex", 1);
+            paramsMap.put("pageSize", 500);
             paramsMap.put("typeselect", "6");
             paramsMap.put("fromDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getBeginDate()));
             paramsMap.put("toDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getEndDate()));
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index ad1f61c2e..fd91d82b6 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -244,11 +244,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
         header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
         // 动态列
         if (CollectionUtils.isNotEmpty(listMaps)) {
-            Map<String, Object> mapColumn = listMaps.get(0);
             for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
-                if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
-                    header.add(attendQuoteField.getFieldName());
-                }
+                header.add(attendQuoteField.getFieldName());
             }
         }
 
@@ -264,11 +261,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
             row.add(dto.get("jobNum"));
 
             // 动态列
-            Map<String, Object> mapColumn = listMaps.get(0);
             for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
-                if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
-                    row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData"));
-                }
+                row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData"));
             }
             rows.add(row);
         }
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index f8d4b8eba..b576564ca 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -275,10 +275,10 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
             getAttendQuoteFieldMapper().updateNameByCode(updates);
         }
         // 2.删除
-        if (CollectionUtils.isNotEmpty(deleteCodes)) {
-            //根据考勤字段编码删除考勤模块字段
-            biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build());
-        }
+//        if (CollectionUtils.isNotEmpty(deleteCodes)) {
+//            //根据考勤字段编码删除考勤模块字段
+//            biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build());
+//        }
         // 3.新增
         List<AttendQuoteFieldPO> saves = new ArrayList<>();
         for (String code : saveCodes) {
diff --git a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
index f9a394da6..ec042926c 100644
--- a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
+++ b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
@@ -32,11 +32,11 @@ import java.util.*;
 public class AttendQuoteDataWrapper extends Service {
 
     private AttendQuoteDataService getAttendQuoteDataService(User user) {
-        return  ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
+        return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
     }
 
     private AttendQuoteFieldService getAttendQuoteFieldService(User user) {
-        return  ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
+        return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
     }
 
     /**
@@ -82,11 +82,8 @@ public class AttendQuoteDataWrapper extends Service {
         columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum"));
         // 动态列
         if (CollectionUtils.isNotEmpty(listMaps)) {
-            Map<String, Object> map = listMaps.stream().max(Comparator.comparingInt(m -> m.keySet().size())).get();
             for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
-                if (map.containsKey(attendQuoteField.getId() + "_attendQuoteData")) {
-                    columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData"));
-                }
+                columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData"));
             }
         }
 
@@ -153,7 +150,7 @@ public class AttendQuoteDataWrapper extends Service {
     /**
      * 获取数据
      */
-    public  Map<String, Object> getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
+    public Map<String, Object> getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
         return getAttendQuoteDataService(user).getData(attendQuoteDataEditParam);
     }
 }
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
index aef7e434b..49d527a06 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
@@ -264,7 +264,11 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
             if (CollectionUtils.isNotEmpty(listAll)) {
                 listAll.removeIf(a -> a.getId().equals(m.getId()));
             }
-            Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst();
+            Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream()
+                    .filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()))
+                    .filter(f ->f.getSalaryItemId().equals(m.getSalaryItemId()))
+                    .filter(f->f.getEffectiveTime().before(m.getEffectiveTime()))
+                    .findFirst();
             m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : "");
 
             m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason()));