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/AdwebEnquiryServiceImpl.java

@@ -751,10 +751,10 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         String specialField = FastJsonUtil.toJSONString(specialFieldsList);
         enquiry.setSpecialField(specialField);
 
-        if (errorObjNames.size() > 0 || enquiry.getRecordCtime() == null || StringUtil.isEmpty(enquiry.getMessage()) || StringUtil.isEmpty(enquiry.getEmail()) || StringUtil.isEmpty(enquiry.getFromPage())) {
+        if (!errorObjNames.isEmpty() || enquiry.getRecordCtime() == null || StringUtil.isEmpty(enquiry.getMessage()) || StringUtil.isEmpty(enquiry.getEmail()) || StringUtil.isEmpty(enquiry.getFromPage())) {
             //发送飞书告警
             StringBuilder msg = new StringBuilder("询盘异常,\n询盘id：" + enquiry.getId() + ",\n站点名称：" + adwebSite.getName() + ",\n站点域名：" + enquiry.getSiteHost() + ",\n来源ip：" + enquiry.getFromIp());
-            if (errorObjNames.size() > 0) {
+            if (!errorObjNames.isEmpty()) {
                 msg.append(",\n字段异常,存在异常字段：");
                 for (String errorObjName : errorObjNames) {
                     msg.append(errorObjName).append("、");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/AdwebSite.java

@@ -108,7 +108,7 @@ public class AdwebSite implements Serializable {
     /**
      * 当前状态：0：已删除；1：正常；2:未发布  3:拉取测试站点中 ；4：发布正式站点中 ;5:拉取异常
      */
-    @Excel(name = "当前状态：0：已删除；1：正常；2:未发布  3:拉取测试站点中 ；4：发布正式站点中 ;5:拉取异常", width = 15)
+    @Excel(name = "当前状态：0：已删除；1：正常；2:未发布  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败", width = 15)
     @Schema(description = "当前状态：0：已删除；1：正常；2:未发布  3:临时站点正在创建 ；4：临时站点创建失败 ;5:正式站点正在创建;6:正式站点创建失败")
     @Dict(dicCode = "site_status")
     private java.lang.Integer status;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -65,10 +65,9 @@ public class SelfWebSiteServiceCommon {
 
     @Transactional
     public AdwebSite saveNewSiteInfo(Long tempId, String uid, String name, String planId, LoginUser sysUser, Integer giveDay, Integer compensateDay) {
-        AdwebSite adwebTemplate = siteService.getById(tempId);
         AdwebTheme adwebTheme = adwebThemeService.getById(tempId);
-        if (adwebTemplate == null) {
-            log.error("未查询到模板数据退出执行，模板ID=" + tempId);
+        if (adwebTheme == null) {
+            log.error("未查询到模板数据退出执行，模板ID={}", tempId);
             return null;
         }
         // 站点CODE
@@ -94,7 +93,7 @@ public class SelfWebSiteServiceCommon {
         adwebSite.setDomainDev(domain);
         //站点code，此处保存
         adwebSite.setCode(siteCode);
-        adwebSite.setInCode(adwebTemplate.getInCode());
+        adwebSite.setInCode(adwebTheme.getCode());
         adwebSite.setIsDomain(0);
         adwebSite.setCtime(new Date());
         adwebSite.setStatus(2);