Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/EnquiryEmailMessageServiceImpl.java

@@ -25,9 +25,9 @@ import org.jeecg.modules.adweb.enquiry.constant.EnquirySendStatus;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiry;
 import org.jeecg.modules.adweb.enquiry.entity.AdwebEnquiryForm;
 import org.jeecg.modules.adweb.enquiry.entity.EnquiryEmailMessage;
+import org.jeecg.modules.adweb.enquiry.mapper.AdwebEnquiryMapper;
 import org.jeecg.modules.adweb.enquiry.mapper.EnquiryEmailMessageMapper;
 import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryFormService;
-import org.jeecg.modules.adweb.enquiry.service.IAdwebEnquiryService;
 import org.jeecg.modules.adweb.enquiry.service.IEnquiryEmailMessageService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
@@ -60,7 +60,7 @@ public class EnquiryEmailMessageServiceImpl
 
   @Resource private IAdwebEnquiryFormService adwebEnquiryFormService;
 
-  @Resource private IAdwebEnquiryService adwebEnquiryService;
+  @Resource private AdwebEnquiryMapper adwebEnquiryMapper;
 
   @Resource private ISysExceptionService sysExceptionService;
 
@@ -107,7 +107,7 @@ public class EnquiryEmailMessageServiceImpl
               new LambdaQueryWrapper<AdwebSite>().eq(AdwebSite::getCode, message.getSiteCode()));
       String fromName = Objects.toString(site.getCompanyName(), site.getName());
 
-      AdwebEnquiry adwebEnquiry = adwebEnquiryService.getById(message.getEnquiryId());
+      AdwebEnquiry adwebEnquiry = adwebEnquiryMapper.selectById(message.getEnquiryId());
 
       if (adwebEnquiry != null
           && org.apache.commons.lang.StringUtils.isNotBlank(adwebEnquiry.getName())) {