优化逻辑

src/main/java/com/bgy/sms/service/impl/MessageServiceImpl.java

@@ -75,7 +75,10 @@ public class MessageServiceImpl implements MessageService {
             String bgySendStr = bean.getUpSendStr();
             String upCreateStr = bean.getUpCreateStr();
             String params = bean.getParams().toString();
-            SmsTemplateInfo dbInfo = smsTemplateService.selectOne(new EntityWrapper<SmsTemplateInfo>().eq("dm_template_id", templateId));
+            SmsTemplateInfo dbInfo = smsTemplateService.selectOne(new EntityWrapper<SmsTemplateInfo>()
+                    .eq("dm_template_id", templateId)
+                    .eq("tenant_id", tenantId)
+            );
             if (dbInfo != null) {
                 log.error("Dm Hub请求创建模板，模板id已存在，模板id：【{}】", templateId);
                 xiaoShuService.updateDmhubSmsTempStatus(REJECTED, templateId, "模板id已存在,请重新创建");
@@ -174,19 +177,7 @@ public class MessageServiceImpl implements MessageService {
 
             } else {
                 upCreateStr = upCreateStr.replaceAll(g, "\\$\\$");
-//                int i = t.indexOf("@");
-//                int i1 = t.indexOf("!");
-//                String str = t.substring(i + 1, i1);
-//                if (isNumeric(str)) {
-//                    Integer integer = Integer.valueOf(str);
-//                    if (integer == 0) {
-//                        upCreateStr = upCreateStr.replaceAll(g, "\\$\\$");
-//                    } else {
-//                        upCreateStr = upCreateStr.replaceAll(g, "\\$\\$");
-//                    }
-//                } else {
-//                    upCreateStr = upCreateStr.replaceAll(g, "\\$\\$");
-//                }
+
             }
         }
         arr.addAll(groups);