Merge branch 'dev' into 'master'

fix: 小程序消息

See merge request !11

common/src/main/java/com/onsiteservice/common/service/MiniAppMessageService.java

@@ -8,6 +8,7 @@ import com.onsiteservice.entity.order.ServiceOrder;
 import com.onsiteservice.service.order.WorkUser;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -78,7 +79,7 @@ public class MiniAppMessageService {
                         new WxMaSubscribeMessage.MsgData("character_string1", order.getOrderNo()),
                         new WxMaSubscribeMessage.MsgData("thing7", order.getServiceName()),
                         new WxMaSubscribeMessage.MsgData("thing11", workUser.getName()),
-                        new WxMaSubscribeMessage.MsgData("phone_number16", workUser.getPhone()),
+                        new WxMaSubscribeMessage.MsgData("phone_number16", StringUtils.defaultString(workUser.getPhone(), "-")),
                         new WxMaSubscribeMessage.MsgData("thing5", remark));
         sendSubscribeMsg(valuatorTmp, user.getOpenId(), data);
     }