diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index 592f283e5..f347d1d41 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -242,19 +242,6 @@ public class XzWorkerInfoAuditRecordController { @PostMapping(value = "/adoptWorkerInfo") public Result adoptWorkerInfo(@RequestBody JSONObject paramMap) { log.info("开始人员下发设备" + paramMap); -// List ids = (List) paramMap.get("id"); -// List ufaceDevId = ufaceDevService.list(Wrappers.lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString())) -// .stream().map(d -> d.getId().toString()).collect(Collectors.toList()); -// if (ufaceDevId.size() > 0) { -// String ufaceDevIds = ufaceDevId.stream().collect(Collectors.joining(",")); -// for (String id : ids) { -// paramMap.put("id", id); -// paramMap.put("ufaceDevId", ufaceDevIds); -// paramMap.put("accountType", 2); -// paramMap.put("registerType", 2); -// workerInfoAuditRecordService.adoptWorkerInfo(paramMap); -// } -// } List workerIds = new ArrayList<>(); JSONArray ids = paramMap.getJSONArray("id"); JSONArray workerInfo = new JSONArray(); @@ -275,6 +262,9 @@ public class XzWorkerInfoAuditRecordController { String workerId = object.getJSONArray("workerId").get(0).toString(); workerIds.add(workerId); WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId); + if (infoAuditRecord == null) { + continue; + } List contractList = new ArrayList<>(); JSONArray contract = object.getJSONArray("contract"); if (contract != null) {