From e916899779fc9f7dcd9d2ef6180f8cd59ab42cac Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 5 Dec 2023 15:00:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81):=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessFbStandardConsultation.java |  4 ++--
 .../service/impl/ConsultationServiceImpl.java | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java
index e2cfecc5..16911005 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java
@@ -112,8 +112,8 @@ public class ProcessFbStandardConsultation implements Serializable {
     @TableField(exist = false)
     private java.lang.String standardNameNumber;
 
-    /**收藏标准来源(1国内、2海外、3企标)*/
-    @ApiModelProperty(value = "收藏标准来源(1国内、2海外、3企标)")
+    /**收准来源(1国内、2海外、3企标)*/
+    @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)")
     @TableField(exist = false)
     private String source;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java
index 25c25a1f..145597f2 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java
@@ -13,9 +13,9 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultati
 import com.jero.modules.laws.consultation.service.IConsultationService;
 import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
-import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
-import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.system.entity.SysDepart;
@@ -52,20 +52,20 @@ public class ConsultationServiceImpl implements IConsultationService {
     private final IProcessFbStandardConsultationService processFbStandardConsultationService;
     private final IProcessFbConsultationListService processFbConsultationListService;
     private final ILawsDomesticStandardService lawsDomesticStandardService;
-    private final ILawsOverseasStandardService lawsOverseasStandardService;
+    private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
     private final ISysDepartService sysDepartService;
     private final IOSSFileService ossFileService;
 
     public ConsultationServiceImpl(IProcessFbStandardConsultationService processFbStandardConsultationService,
                                    IProcessFbConsultationListService processFbConsultationListService,
                                    ILawsDomesticStandardService lawsDomesticStandardService,
-                                   ILawsOverseasStandardService lawsOverseasStandardService,
+                                   ILawsEnterpriseStandardService lawsEnterpriseStandardService,
                                    ISysDepartService sysDepartService,
                                    IOSSFileService ossFileService) {
         this.processFbStandardConsultationService = processFbStandardConsultationService;
         this.processFbConsultationListService = processFbConsultationListService;
         this.lawsDomesticStandardService = lawsDomesticStandardService;
-        this.lawsOverseasStandardService = lawsOverseasStandardService;
+        this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
         this.sysDepartService = sysDepartService;
         this.ossFileService = ossFileService;
     }
@@ -96,14 +96,14 @@ public class ConsultationServiceImpl implements IConsultationService {
 
             // 国标
             LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(StandardConsultation.getStandardId());
-            // 海外
-            LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.getById(StandardConsultation.getStandardId());
+            // 企标
+            LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getById(StandardConsultation.getStandardId());
             if (!Objects.isNull(lawsDomesticStandard)){
                 standardName = lawsDomesticStandard.getStandardName();
                 StandardConsultation.setSource("1");
-            }else if (!Objects.isNull(lawsOverseasStandard)){
-                standardName = lawsOverseasStandard.getStandardName();
-                StandardConsultation.setSource("2");
+            }else if (!Objects.isNull(lawsEnterpriseStandard)){
+                standardName = lawsEnterpriseStandard.getStandardName();
+                StandardConsultation.setSource("3");
             }
 
             StandardConsultation.setStandardNameNumber(StandardConsultation.getStandardNumber() + " " + standardName);