微信订阅优化

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -155,11 +155,17 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                     if (WxmpMessageConstant.RESI.equals(clientType)) {
                         UserBasicInfoFormDTO userBasicInfoFormDTO = new UserBasicInfoFormDTO();
                         userBasicInfoFormDTO.setUserId(userId);
-                        openId = epmetUserOpenFeignClient.getUserBasicInfo(userBasicInfoFormDTO).getData().getOpenId();
+                        UserBasicInfo data = epmetUserOpenFeignClient.getUserBasicInfo(userBasicInfoFormDTO).getData();
+                        if (data != null){
+                            openId = data.getOpenId();
+                        }
                     } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
                         StaffBasicInfoFormDTO staffBasicInfoFormDTO = new StaffBasicInfoFormDTO();
                         staffBasicInfoFormDTO.setStaffId(userId);
-                        openId = epmetUserOpenFeignClient.getStaffBasicInfo(staffBasicInfoFormDTO).getData().getOpenId();
+                        StaffBasicInfo data = epmetUserOpenFeignClient.getStaffBasicInfo(staffBasicInfoFormDTO).getData();
+                        if (data != null){
+                            openId = data.getOpenId();
+                        }
                     } else {
                         throw new WxSubscribeException("clientType有误", "", openId);
                     }
@@ -168,7 +174,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                 }
 
                 if (StringUtils.isBlank(openId)) {
-                    throw new WxSubscribeException("openId获取失败", "", "");
+                    throw new WxSubscribeException("该userId未查询到关联的openId", "", "");
                 }
                 //获取模板id
                 if (customerTemplateListResultDTOS.size() > NumConstant.ZERO) {