From 386786457aedfb8af24d3a291cdd1c9c1ed97ed2 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 21 Mar 2024 20:05:16 +0800
Subject: [PATCH] null pointer

---
 .../com/zdxt/knowledge/controller/WechatLoginController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java
index 6caeb8ab..a177b81f 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java
@@ -131,7 +131,7 @@ public class WechatLoginController extends BaseController {
             // 判断用户是否已拥有该勋章
             WechatUser user = wechatService.selectUserById(wechatUser.getGuid());
             String medalStr = user.getMedal();
-            if (Objects.nonNull(medalObj) && medalStr.contains(medalObj.getGuid())) {
+            if (Objects.nonNull(medalObj) && StringUtils.isNotEmpty(medalStr) && medalStr.contains(medalObj.getGuid())) {
                 // 已拥有直接返回
                 return ZDResponse.success("0", null);
             }