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 95e1618ac..eeddfd41d 100644
--- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
+++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
@@ -131,11 +131,10 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
 
     @Override
     public List<Map<String, String>> getDatas(Attend4Salary attend4Salary) {
-        ValidUtil.doValidator(attend4Salary);
-        log.info("salaryAttend开始获取的考勤数据，参数{}", attend4Salary);
         List<Map<String, String>> list = new ArrayList<>();
 
         try {
+            ValidUtil.doValidator(attend4Salary);
             Map<String, Object> paramsMap = new HashMap<String, Object>();
             paramsMap.put("pageIndex", 1);
             paramsMap.put("pageSize", 500);
@@ -152,6 +151,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
             Map<String, Object> temp = new HashMap<String, Object>();
             temp.put("data", JSONObject.toJSONString(paramsMap));
             temp.put("reportType", "month");
+
+            log.info("salaryAttend开始获取的考勤数据，参数{}", temp);
             list = (List<Map<String, String>>) commandExecutor.execute(new GetKQReportCmd(temp, user)).get("datas");
             if (isLog) {
                 log.info("salaryAttend获取的考勤数据，{}", JSONUtils.toJSONString(list));
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 750f11ec2..48648cc57 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -382,7 +382,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
                 List<Long> employeeIds = SalaryEntityUtil.properties(salaryEmployees, DataCollectionEmployee::getEmployeeId, Collectors.toList());
                 List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salarySobCycleDTO.getSalaryCycle(), employeeIds, taxAgentId);
                 // 转换成薪资核算人员po
-                Date salaryDate = SalaryDateUtil.dateStrToLocalTime(salaryYearMonth + "-01");
+                Date salaryDate = SalaryDateUtil.dateStrToLocalDate(salaryYearMonth + "-01");
                 List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = SalaryAcctEmployeeBO.convert2Employee(salaryEmployees, SalaryAcctRecordPO.builder().salarySobId(salarySobId).salaryMonth(salaryDate).build(), salaryArchiveDataDTOS, (long) user.getUID());
 
                 //过滤掉不属于当前账套扣缴义务人的人员
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 4a834df1a..ed1db9bed 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -1261,10 +1261,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
         if (param.getLockStatus() == LockStatusEnum.LOCK) {
             lockItemIds.add(salaryItemId);
         } else {
-            lockItemIds.remove(salaryItemId);
+            lockItemIds.removeIf(salaryItemId::equals);
         }
 
-        salaryAcctEmployeePO.setLockItems(lockItemIds);
+        salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
 
         getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
     }
@@ -1291,7 +1291,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             } else {
                 lockItemIds.removeAll(salaryItemIds);
             }
-            salaryAcctEmployeePO.setLockItems(lockItemIds);
+            salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
             getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
         });