From c4dce5ac53b584d9f8575c593adb665d761fe1ae Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 20 Jun 2024 10:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XzWorkerInfoAuditRecordController.java       | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

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<WorkerInfoAuditRecord> adoptWorkerInfo(@RequestBody JSONObject paramMap) {
         log.info("开始人员下发设备" + paramMap);
-//        List<String> ids = (List<String>) paramMap.get("id");
-//        List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>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<String> 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<WorkerContract> contractList = new ArrayList<>();
             JSONArray contract = object.getJSONArray("contract");
             if (contract != null) {