diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/dto/SubscribeMessageReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/dto/SubscribeMessageReqDTO.java index 3a640b1f..1e6346de 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/dto/SubscribeMessageReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/dto/SubscribeMessageReqDTO.java @@ -1,8 +1,6 @@ package cn.iocoder.yudao.module.system.api.subscribe.dto; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; import lombok.Data; import javax.validation.constraints.NotNull; @@ -17,7 +15,6 @@ import java.util.List; */ @Schema(description = "RPC 服务 - 微信小程序订阅消息 Request DTO") @Data -@Builder public class SubscribeMessageReqDTO { @Schema(description = "接收者(用户)的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "o3bwX6Yw1bvbMAV-jUNjHrbrJu0I") @@ -44,6 +41,6 @@ public class SubscribeMessageReqDTO { } @Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1:小程序模版:2:公众号模版") - @Builder.Default + @NotNull(message = "模版类型不能为空") private String minOrMpType = "1" ; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java index bb5ecf3a..c94cfb17 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java @@ -38,9 +38,9 @@ public class SubscribeMessageSendApiImpl implements SubscribeMessageSendApi { //发送审批结果通知 String type = reqDTO.getMinOrMpType() ; if( type == null || type.equals("1") ) { - socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ; - } else { socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO)); + } else { + socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ; } return success(1L); } @@ -51,9 +51,10 @@ public class SubscribeMessageSendApiImpl implements SubscribeMessageSendApi { //发送OA流程待办提醒 String type = reqDTO.getMinOrMpType() ; if( type == null || type.equals("1") ) { - socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ; - } else { socialClientService.getWxMaService().getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO)); + } else { + socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO)) ; + } return success(1L); }