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 existTeamInfos = teamInfoService.list(new LambdaQueryWrapper() - .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 existTeamInfos = teamInfoService.list(new LambdaQueryWrapper() + .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()); + } } }