From 5274179ce28d13bf5151a1223a8eb6223ad3a8b6 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 17 Jun 2022 14:01:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index aaae03a61..521c8f85e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -115,7 +115,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
      */
     @Override
     public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
-        DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
+        List<String> baseIdList = Arrays.asList(dummyInventoryBaseEO.getId().split(","));
+        List<DummyInventoryBaseEO> baseEOList = listByIds(baseIdList);
         List<String> createByNameList =new ArrayList<>();
         if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
             createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
@@ -124,14 +125,19 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 // 增加创建者校验
                 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                 String loginUserName = sysUser.getUsername();
-
-                if (!baseEO.getCreateBy().contains(loginUserName)) {
-                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                        throw new JeroBootException("当前用户非创建者,无法编辑");
-                    } else {
-                        throw new JeroBootException("The current user is not the creator and cannot be edited.");
+                StringBuilder messageBuilder = new StringBuilder();
+                for (DummyInventoryBaseEO baseEO : baseEOList) {
+                    if (!baseEO.getCreateBy().contains(loginUserName)) {
+                        messageBuilder.append(baseEO.getName()).append(",");
                     }
                 }
+                String message = messageBuilder.substring(0, messageBuilder.length() - 1);
+                if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                    throw new JeroBootException("当前用户非"+message+"的创建者,无法编辑");
+                } else {
+                    throw new JeroBootException(
+                            "The current user is not the creator of "+message+" and cannot be edited.");
+                }
             }
         }
 

From 256e86e6a4d62a4ae4434f74a7776a67f8b5d282 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 17 Jun 2022 14:10:06 +0800
Subject: [PATCH 2/3] =?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

---
 jero-web/src/components/setCreator/index.vue        |  7 +++++++
 .../src/views/documentTools/virtualList/index.vue   |  8 ++++----
 .../projectManagement/ProjectDetails/index.vue      | 13 +++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/components/setCreator/index.vue b/jero-web/src/components/setCreator/index.vue
index a0bc63999..8d7e4b058 100644
--- a/jero-web/src/components/setCreator/index.vue
+++ b/jero-web/src/components/setCreator/index.vue
@@ -97,6 +97,13 @@
         this.visibleTree = false
       },
       handleSubmit() {
+        if (this.userName.length > 1) {
+          this.$message.warning(this.$t('onlyOnePersonCanBeSelected'))
+          return
+        } else if (this.userName.length == 0) {
+          this.$message.warning(this.$t('pleaseSelectPersonFirst'))
+          return
+        }
         let query = {
           id: this.tableKey,
           createBy: this.userName.join(',')
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 245b3aeb0..20b137091 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -33,10 +33,10 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="setCreatorClick" class="operator-text" v-has="'dummyInventoryBase:add'">
-        <a-icon type="setting"/>
-        {{$t('setCreator')}}
-      </div>
+<!--      <div @click="setCreatorClick" class="operator-text" v-has="'dummyInventoryBase:add'">-->
+<!--        <a-icon type="setting"/>-->
+<!--        {{$t('setCreator')}}-->
+<!--      </div>-->
       <div @click="handleAdd" class="operator-text" v-has="'dummyInventoryBase:add'">
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 152e4189d..3b845cad6 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -70,6 +70,7 @@
     <updateLog :url="url" ref="updateLogRef"/>
     <historicalVersionList ref="historicalVersionListRef"/>
     <commentList ref="commentListRef"/>
+    <JLoading :loading="loading"></JLoading>
   </div>
 </template>
 
@@ -103,6 +104,7 @@
         isDisplayNum: '',
         textTitle: '',
         isTrue: true,
+        loading: false,
         url: {
           logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: '',
@@ -224,10 +226,14 @@
         postAction('/project/projectRelatedPersonnel/page', query).then((res) => {
           if (res.success) {
             let dataSource = res.result || []
+            console.log(dataSource)
             dataSource.forEach(res => {
-              this.engineeringInterfacePerson += res.engineeringInterfacePerson + ','
+              if (res.engineeringInterfacePerson || res.certificationEngineer || res.lawEngineer) {
+                this.engineeringInterfacePerson += res.engineeringInterfacePerson + ',' + res.certificationEngineer + ',' + res.lawEngineer + ','
+              }
             })
-            if (this.engineeringInterfacePerson.includes(this.userInfo().id)) {
+            if (this.engineeringInterfacePerson.includes(this.userInfo().id) ||
+              this.$route.query.studioEngineer == this.userInfo().id) {
               this.isTrue = true
             } else {
               this.isTrue = false
@@ -235,8 +241,10 @@
             this.$nextTick(() => {
               this.textColor(0)
             })
+            this.loading = false
           } else {
             this.textColor(0)
+            this.loading = false
           }
         })
       },
@@ -264,6 +272,7 @@
   .doc-detail {
     background: #fff;
     height: 100%;
+    position: relative;
 
     .Virtual-detail-header {
       width: 100%;

From 21e280d7a753dc7cfd035896c9285ee41c3eaf73 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 17 Jun 2022 14:18:12 +0800
Subject: [PATCH 3/3] =?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

---
 jero-web/src/views/documentTools/virtualList/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 20b137091..245b3aeb0 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -33,10 +33,10 @@
       </a-form>
     </div>
     <div class="table-operator">
-<!--      <div @click="setCreatorClick" class="operator-text" v-has="'dummyInventoryBase:add'">-->
-<!--        <a-icon type="setting"/>-->
-<!--        {{$t('setCreator')}}-->
-<!--      </div>-->
+      <div @click="setCreatorClick" class="operator-text" v-has="'dummyInventoryBase:add'">
+        <a-icon type="setting"/>
+        {{$t('setCreator')}}
+      </div>
       <div @click="handleAdd" class="operator-text" v-has="'dummyInventoryBase:add'">
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}