diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java index 68eec75..0204b35 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java @@ -56,7 +56,15 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { */ @Override public List selectWxUserScriptLogList(WxUserScriptLog wxUserScriptLog) { - return wxUserScriptLogMapper.selectWxUserScriptLogList(wxUserScriptLog); + List wxUserScriptLogs = wxUserScriptLogMapper.selectWxUserScriptLogList(wxUserScriptLog); + for (WxUserScriptLog userScriptLog : wxUserScriptLogs) { + if (userScriptLog.getIsCustom() == 0 && userScriptLog.getScriptTemplateId() != null) { + WxScriptTemplate wxScriptTemplate = wxScriptTemplateMapper.selectWxScriptTemplateById(userScriptLog.getScriptTemplateId().longValue()); + userScriptLog.setContent(wxScriptTemplate.getContent()); + userScriptLog.setTitile(wxScriptTemplate.getTitile()); + } + } + return wxUserScriptLogs; } /** diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 27dc3fe..0f5533d 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -240,7 +240,7 @@ - +