Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

This commit is contained in:
guoshengxiong 2024-06-28 14:31:55 +08:00
commit 67d06b1cfd

View File

@ -264,11 +264,11 @@ public class XzWorkerInfoAuditRecordController {
for (Object o : workerInfo) {
JSONObject object = JSONObject.parseObject(JSON.toJSONString(o));
String workerId = object.getJSONArray("workerId").get(0).toString();
workerIds.add(workerId);
WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId);
if (infoAuditRecord == null) {
continue;
}
workerIds.add(workerId);
List<WorkerContract> contractList = new ArrayList<>();
JSONArray contract = object.getJSONArray("contract");
if (contract != null) {