diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
index ec9ec49fc..e99ca125b 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 /**
  * 占桩订单controller
@@ -119,9 +120,8 @@ public class OccupyOrderController extends BaseController {
             String memberId = getMemberIdByAuthorization(request);
             logger.info("查询用户: {} 是否有未支付的占桩订单", memberId);
             OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId);
-            String occupyCode = orderPileOccupy.getOccupyCode();
-            if (StringUtils.isNotBlank(occupyCode)) {
-                response = new RestApiResponse<>(ImmutableMap.of("occupyCode", occupyCode));
+            if (Objects.nonNull(orderPileOccupy)) {
+                response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode()));
             }
         } catch (Exception e) {
             logger.error("查询用户是否有未支付的占桩订单 error,", e);
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java
index 159e5fd1b..0c933984b 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java
@@ -188,6 +188,7 @@ public class CommonController {
 			log.info("图片上传成功 url:{}", url);
 			return ajax;
 		}catch (Exception e){
+			log.error("上传到阿里云oss error, ", e);
 			return AjaxResult.error(e.getMessage());
 		}
 	}