From de1c74133eb1add436a5235a6a63cb9800ac7c5f Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Fri, 8 Jul 2022 18:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/worker/WorkerCertificationController.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
index d26ff451..f06227b2 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
@@ -173,9 +173,11 @@ public class WorkerCertificationController extends BaseController
     public AjaxResult getByWorkerId(@RequestBody WorkerCertification request) {
         try {
             WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(request.getWorkerId());
-            workerCertification.setSpecialSkills(workerSpecialSkillService.getByWorker(request.getWorkerId()));
-            SysArea sysArea = sysAreaService.selectById(workerCertification.getCompanyCountryId());
-            workerCertification.setMergerName(sysArea.getMergerName());
+            if (workerCertification != null) {
+                workerCertification.setSpecialSkills(workerSpecialSkillService.getByWorker(request.getWorkerId()));
+                SysArea sysArea = sysAreaService.selectById(workerCertification.getCompanyCountryId());
+                workerCertification.setMergerName(sysArea.getMergerName());
+            }
             return AjaxResult.success(workerCertification);
         } catch (Exception e) {
             e.printStackTrace();