Merge pull request #11 from donhui/patch-2

fix NullPointerException when get executorMobile
jenkinsci · Dec 20, 2022 · 9fcaa10 · 9fcaa10
2 parents 4286d10 + 4bbb57c
commit 9fcaa10
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/io/jenkins/plugins/wxwork/utils/JenkinsUtils.java b/src/main/java/io/jenkins/plugins/wxwork/utils/JenkinsUtils.java
@@ -41,9 +41,14 @@ public static RunUser getRunUser(Run<?, ?> run, TaskListener listener) {
             executorName = run.getCauses().stream().map(Cause::getShortDescription).collect(Collectors.joining());
         } else {
             executorName = user.getDisplayName();
-            executorMobile = user.getProperty(WXWorkUserExtensionProperty.class).getMobile();
-            if (executorMobile == null) {
+            WXWorkUserExtensionProperty executorProperty = user.getProperty(WXWorkUserExtensionProperty.class);
+            if (executorProperty == null) {
                 listener.error("用户【%s】暂未设置手机号码，请前往 %s 添加。", executorName, user.getAbsoluteUrl() + "/configure");
+            } else {
+                executorMobile = executorProperty.getMobile();
+                if (StrUtils.isBlank(executorMobile)){
+                    listener.error("用户【%s】暂未设置手机号码，请前往 %s 添加。", executorName, user.getAbsoluteUrl() + "/configure");
+                }
             }
         }
         return RunUser.builder().name(executorName).mobile(executorMobile).build();