From 9646e06df754774b2b39c8cf12f1619be6e00bb8 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 1 Mar 2025 12:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 50a7e578b..4e9750bc2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -616,18 +616,20 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         //更新工种
         if (!Objects.equals(workerInfo.getWorkerTypeId(), oldWorkerInfo.getWorkerTypeId())) {
             WorkerType type = workerTypeService.getById(workerInfo.getWorkerTypeId());
-            List<TeamInfo> existTeamInfos = teamInfoService.list(new LambdaQueryWrapper<TeamInfo>()
-                    .eq(TeamInfo::getProjectSn, projectSn).eq(TeamInfo::getWorkerTypeId, type.getId()).eq(TeamInfo::getEnterpriseId, workerInfo.getEnterpriseId()).eq(TeamInfo::getTeamName, type.getTypeName()));
-            if (CollUtil.isNotEmpty(existTeamInfos)) {
-                workerInfo.setTeamId(existTeamInfos.get(0).getId());
-            } else {
-                TeamInfo teamInfo = new TeamInfo();
-                teamInfo.setTeamName(type.getTypeName());
-                teamInfo.setProjectSn(projectSn);
-                teamInfo.setEnterpriseId(workerInfo.getEnterpriseId());
-                teamInfo.setWorkerTypeId(type.getId());
-                teamInfoService.saveTeamInfo(teamInfo);
-                workerInfo.setTeamId(teamInfo.getId());
+            if (type != null) {
+                List<TeamInfo> existTeamInfos = teamInfoService.list(new LambdaQueryWrapper<TeamInfo>()
+                        .eq(TeamInfo::getProjectSn, projectSn).eq(TeamInfo::getWorkerTypeId, type.getId()).eq(TeamInfo::getEnterpriseId, workerInfo.getEnterpriseId()).eq(TeamInfo::getTeamName, type.getTypeName()));
+                if (CollUtil.isNotEmpty(existTeamInfos)) {
+                    workerInfo.setTeamId(existTeamInfos.get(0).getId());
+                } else {
+                    TeamInfo teamInfo = new TeamInfo();
+                    teamInfo.setTeamName(type.getTypeName());
+                    teamInfo.setProjectSn(projectSn);
+                    teamInfo.setEnterpriseId(workerInfo.getEnterpriseId());
+                    teamInfo.setWorkerTypeId(type.getId());
+                    teamInfoService.saveTeamInfo(teamInfo);
+                    workerInfo.setTeamId(teamInfo.getId());
+                }
             }
         }