From f65ab04f2d88c47bd56c7d0a62e489b39b338317 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Wed, 8 Mar 2023 09:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF=E5=8A=A0?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=E6=A0=87=E8=AF=86=E6=A0=B9=E6=8D=AE=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/BizSendMsgTemplateMapper.xml                     | 2 +-
 .../extend/bizshortmessageemail/entity/BizSendMsgTemplate.java  | 2 +-
 .../service/impl/BizSendMsgTemplateServiceImpl.java             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml
index 4f3badd..c860cdd 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/dao/mapper/BizSendMsgTemplateMapper.xml
@@ -13,7 +13,7 @@
             <result column="task_form"  jdbcType="VARCHAR" property="taskForm"/>
             <result column="receiver"  jdbcType="VARCHAR" property="receiver"/>
             <result column="remark"  jdbcType="VARCHAR" property="remark"/>
-            <result column="using"  jdbcType="INTEGER" property="using"/>
+            <result column="use_flag"  jdbcType="INTEGER" property="useFlag"/>
             <result column="purchasing_method"  jdbcType="VARCHAR" property="purchasingMethod"/>
     </resultMap>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java
index f620cf7..32fb430 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/BizSendMsgTemplate.java
@@ -91,6 +91,6 @@ public class BizSendMsgTemplate implements Serializable {
      * 是否启用
      */
     @ApiModelProperty(value = "是否启用 0-否 1-是")
-    private Integer using;
+    private Integer useFlag;
 
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
index 868788a..e477aa4 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
@@ -60,7 +60,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
                 QueryWrapper<BizSendMsgTemplate> query = new QueryWrapper<>(new BizSendMsgTemplate().setTemplateId(templateId));
                 //获得短信模板信息
                 BizSendMsgTemplate msgTemplate = this.getOne(query);
-                if(msgTemplate.getUsing()==1){
+                if(msgTemplate.getUseFlag()!=null && msgTemplate.getUseFlag()==1){
 
                     //替换字段，形成需要发送的短信内容
                     String magContent = generateMsgFromTemplete(msgTemplate.getContent(), msgInfo.getTempParamMap());