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();