admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
guoshengxiong 2024-06-28 14:31:55 +08:00
commit 67d06b1cfd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
View File

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