From 011963e1ca080266bdabc65d06fa3ad675deee72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 26 Aug 2022 09:17:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../problemKnowledgeBase/components/countryCardRelease.vue  | 6 +++---
 .../problemKnowledgeBase/components/countryCardView.vue     | 6 +++---
 .../components/problemKnowledgeBaseRelease.vue              | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index ef8eccc3b..74303385f 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{$t('managePublishing')}}
         </div>
       </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index 1ba768a85..7b2dc2aa0 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{header_text}}
         </div>
       </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index f752ef697..80f587226 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{$t('managePublishing')}}
         </div>
       </div>

From 99a266c77f12789119e256befa6d08d083e33dbb Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 26 Aug 2022 10:16:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8A=8A?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93id=E8=AE=BE=E7=BD=AE=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E8=A1=A8=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 44c08d6b0..be5eae4d4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -387,8 +387,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.CN.getValue());
 			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.EN.getValue());
 		}
-		//项目任务清单数据初始化。
-		this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){
+			//项目任务清单数据初始化。
+			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+		}
 	}
 
 	/**
@@ -4827,6 +4830,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
 					projectTaskInventoryEO.setId(projectTaskInventoryId);
 					projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+					projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
 					projectTaskInventoryEOList.add(projectTaskInventoryEO);
 				}
 				this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);