From d498f693733a107e5f6e8fa2e8df7591b4924af1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 10:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
index 3fe4e19..924cbe1 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.mapper.ReplyTemplateMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IReplyTemplateService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -34,14 +35,38 @@
public ReplyTemplateEntity selectConfigData(String Id) {
ReplyTemplateEntity replyTemplateEntity = baseMapper.selectConfigData(Id);
if (replyTemplateEntity!=null)
- { String[] split;
- if (replyTemplateEntity.getAccessoryId()!=null){
- split = replyTemplateEntity.getAccessoryId().split(",");
- replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ {
+ if(!StringUtils.isEmpty(replyTemplateEntity.getAccessoryId()))
+ {
+ if(replyTemplateEntity.getAccessoryId().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getAccessoryId()};
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getAccessoryId().split(",");
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
}
- if (replyTemplateEntity.getGuidance()!=null){
- split=replyTemplateEntity.getGuidance().split(",");
- replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+
+
+ if (!StringUtils.isEmpty(replyTemplateEntity.getGuidance())){
+
+ if(replyTemplateEntity.getGuidance().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getGuidance()};
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getGuidance().split(",");
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+
+
}
return replyTemplateEntity;
}
--
Gitblit v1.7.1