From afce6628e2e69138353f0c3a6770d859488dda4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 23 Jun 2025 19:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AUserVerify=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/UserVerifyController.java | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java
index 1bb0d68..a47d381 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java
@@ -1,22 +1,19 @@
 package com.gxwebsoft.common.system.controller;
 
 import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.Organization;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.UserVerify;
+import com.gxwebsoft.common.system.param.UserVerifyParam;
 import com.gxwebsoft.common.system.service.OrganizationService;
 import com.gxwebsoft.common.system.service.UserService;
 import com.gxwebsoft.common.system.service.UserVerifyService;
-import com.gxwebsoft.common.system.entity.UserVerify;
-import com.gxwebsoft.common.system.param.UserVerifyParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -80,7 +77,7 @@ public class UserVerifyController extends BaseController {
     }
     wrapper.last("limit 1");
     final UserVerify one = userVerifyService.getOne(wrapper);
-    if(one.getOrganizationId() > 0){
+    if(ObjUtil.isNotEmpty(one) && one.getOrganizationId() > 0){
       final Organization organization = organizationService.getById(one.getOrganizationId());
       one.setOrganizationName(organization.getOrganizationName());
     }