From 810eaf817360aa63c86f897c6bfe1b3630492ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 22 Mar 2023 09:17:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B7=B3=E8=BD=AC=E7=9F=A5=E8=AF=86=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchCenter/components/whole.vue         | 503 +++++++++---------
 .../components/changeExtensionModel.vue       |   3 +-
 2 files changed, 255 insertions(+), 251 deletions(-)

diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index a0f74948c..f4b548eb6 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="search-text-title">
-      <span>{{$t('searchScope')}}：</span>
+      <span>{{ $t('searchScope') }}：</span>
       <span>{{ queryParam.selectValue }}</span>
     </div>
     <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
@@ -18,7 +18,7 @@
                 <span class="text-header-text" style="cursor: pointer" v-html="item.module_type"></span>
               </a-tooltip>
               <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
-              <template slot="title">
+                <template slot="title">
                   <span v-html="item.serial_number"></span>
                 </template>
                 <span style="cursor: pointer"
@@ -27,16 +27,17 @@
                       v-html="item.serial_number"></span>
               </a-tooltip>
               <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
-              <template slot="title">
+                <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
                 <span class="text-header-text" v-if="item.title" style="cursor: pointer" v-html="item.title"></span>
               </a-tooltip>
               <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
-              <template slot="title">
+                <template slot="title">
                   <span v-html="item.file_name"></span>
                 </template>
-                <span class="text-header-text" v-if="item.file_name && item.module_type_flag == 'WDK'" style="cursor: pointer"
+                <span class="text-header-text" v-if="item.file_name && item.module_type_flag == 'WDK'"
+                      style="cursor: pointer"
                       v-html="item.file_name"></span>
               </a-tooltip>
               <!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
@@ -106,286 +107,288 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile } from '@/api/manage'
-  import { Base64 } from 'js-base64'
-  import { mapGetters } from 'vuex'
+import { getAction, postAction, downloadFile } from '@/api/manage'
+import { Base64 } from 'js-base64'
+import { mapGetters } from 'vuex'
 
-  export default {
-    name: 'whole',
-    data() {
-      return {
-        checkboxText: [],
-        url: {
-          getInfoList: 'search/document/getFullTextInfoList'
-        },
-        conList: [],
-        total: 0,
-        pageSize: 10,
-        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
-        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
-        pageNo: 1,
-        queryParam: {}
-      }
-    },
-    watch: {
-      checkboxText: function(value) {
+export default {
+  name: 'whole',
+  data() {
+    return {
+      checkboxText: [],
+      url: {
+        getInfoList: 'search/document/getFullTextInfoList'
+      },
+      conList: [],
+      total: 0,
+      pageSize: 10,
+      downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+      downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
+      pageNo: 1,
+      queryParam: {}
+    }
+  },
+  watch: {
+    checkboxText: function(value) {
+      this.conList.forEach(val => {
+        val.checked = false
+      })
+      if (value.length > 0) {
         this.conList.forEach(val => {
-          val.checked = false
-        })
-        if (value.length > 0) {
-          this.conList.forEach(val => {
-            value.forEach(res => {
-              if (res === val.id) {
-                val.checked = true
-              }
-            })
+          value.forEach(res => {
+            if (res === val.id) {
+              val.checked = true
+            }
           })
-        }
-        this.conList = [...this.conList]
+        })
+      }
+      this.conList = [...this.conList]
+    }
+  },
+  mounted() {
+    this.conList = []
+    // if (!this.queryParam.selectValue) {
+    //   this.getList()
+    // }
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    checkedClick(item) {
+      if (item.checked) {
+        this.checkboxText = this.checkboxText.filter(res => {
+          return res !== item.id
+        })
+      } else {
+        this.checkboxText.push(item.id)
       }
     },
-    mounted() {
-      this.conList = []
-      // if (!this.queryParam.selectValue) {
-      //   this.getList()
-      // }
+    ResetSearch() {
+      this.pageNo = 1
+      this.checkboxText = []
+      this.queryParam = {}
+      this.getList()
     },
-    methods: {
-      ...mapGetters(['userInfo']),
-      checkedClick(item) {
-        if (item.checked) {
-          this.checkboxText = this.checkboxText.filter(res => {
-            return res !== item.id
-          })
-        } else {
-          this.checkboxText.push(item.id)
+    fileClick(fileQuery) {
+      let fileName = fileQuery.file_name
+      let index1 = fileName.lastIndexOf('.')
+      let index2 = fileName.length
+      let fileSuffix = fileName.substring(index1, index2)
+      if (fileSuffix == '.pdf') {
+        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username))
+      } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
+        window.open(url, '_blank')
+      } else {
+        downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0, 32) })
+      }
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    searchData(value) {
+      this.queryParam.selectValue = value || undefined
+      this.queryParam.selectValueTwo = undefined
+      this.getList()
+    },
+    searchDataTwo(value) {
+      this.queryParam.selectValueTwo = value
+      this.getList()
+    },
+    getText(str) {
+      let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
+      //.replace(/\s/g, '') //这里是去除空格
+      return words
+    },
+    getList() {
+      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      Object.keys(queryParam).forEach(val => {
+        if (queryParam[val] instanceof Array) {
+          queryParam[val] = queryParam[val].join(',')
         }
-      },
-      ResetSearch() {
-        this.pageNo = 1
-        this.checkboxText = []
-        this.queryParam = {}
-        this.getList()
-      },
-      fileClick(fileQuery) {
-        let fileName = fileQuery.file_name
-        let index1 = fileName.lastIndexOf('.')
-        let index2 = fileName.length
-        let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username))
-        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
-          window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
-          window.open(url, '_blank')
+      })
+      let checkboxText = JSON.parse(JSON.stringify(this.checkboxText))
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ids: checkboxText.join(','),
+        ...queryParam
+      }
+      postAction(this.url.getInfoList, query).then((res) => {
+        if (res.success) {
+          this.conList = res.result.records
+          if (this.conList && this.conList.length > 0) {
+            this.conList.forEach(val => {
+              val.content = val.content.replace(/<img .*?>/g, '')
+              val.content = val.content.replace(/<\/?p[^>]*>/gi, '')
+            })
+          }
+          this.total = res.result.total
         } else {
-          downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0, 32) })
+          this.conList = []
         }
-      },
-      pageOnChange(page, pageSize) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      searchData(value) {
-        this.queryParam.selectValue = value || undefined
-        this.queryParam.selectValueTwo = undefined
-        this.getList()
-      },
-      searchDataTwo(value) {
-        this.queryParam.selectValueTwo = value
-        this.getList()
-      },
-      getText(str) {
-        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        //.replace(/\s/g, '') //这里是去除空格
-        return words
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
+      })
+    },
+    monthlyReportClick(item) {
+      let fileName = item.file_name
+      let index1 = fileName.lastIndexOf('.')
+      let index2 = fileName.length
+      let fileSuffix = fileName.substring(index1, index2)
+      if (fileSuffix == '.pdf') {
+        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username))
+      } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+        window.open(url, '_blank')
+      } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + item.file_id + fileSuffix)
+        window.open(url, '_blank')
+      }
+    },
+    titleClick(item) {
+      if (item.module_type_flag == 'FGYB') {
+        this.monthlyReportClick(item)
+      } else if (item.module_type_flag == 'WTZSK') {
+        let id = item.id.slice(0, item.id.length - 4)
+        this.$router.push({
+          path: '/problemknowledgeBase',
+          query: {
+            id: id
           }
         })
-        let checkboxText = JSON.parse(JSON.stringify(this.checkboxText))
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ids: checkboxText.join(','),
-          ...queryParam
-        }
-        postAction(this.url.getInfoList, query).then((res) => {
-          if (res.success) {
-            this.conList = res.result.records
-            if (this.conList && this.conList.length > 0) {
-              this.conList.forEach(val => {
-                val.content = val.content.replace(/<img .*?>/g, '')
-                val.content = val.content.replace(/<\/?p[^>]*>/gi,'')
-              })
-            }
-            this.total = res.result.total
-          } else {
-            this.conList = []
+      } else {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.id.slice(0, 32),
+            title: item.title,
+            serial_number: item.serial_number
           }
         })
-      },
-      monthlyReportClick(item) {
-        let fileName = item.file_name
-        let index1 = fileName.lastIndexOf('.')
-        let index2 = fileName.length
-        let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username))
-        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
-          window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + item.file_id + fileSuffix)
-          window.open(url, '_blank')
-        }
-      },
-      titleClick(item) {
-        if (item.module_type_flag == 'FGYB') {
-          this.monthlyReportClick(item)
-        } else if (item.module_type_flag == 'WTZSK') {
-          let newUrl = this.$router.resolve({
-            path: '/problemKnowledgeBaseView',
-            query: {
-              id: item.id
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        } else {
-          let newUrl = this.$router.resolve({
-            path: '/docManage/library/detail',
-            query: {
-              id: item.id.slice(0, 32),
-              title: item.title,
-              serial_number: item.serial_number
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        }
+        window.open(newUrl.href, '_blank')
       }
     }
   }
+}
 </script>
 <style lang="less">
-  .highlight-class {
-    color: #21c9cc;
-  }
+.highlight-class {
+  color: #21c9cc;
+}
 
-  .tooltip-index {
-    max-width: calc(100% - 300px) !important;
-   .ant-tooltip-inner {
+.tooltip-index {
+  max-width: calc(100% - 300px) !important;
+
+  .ant-tooltip-inner {
     color: #333;
     background-color: #fff !important;
-    }
-   .ant-tooltip-arrow::before {
-    background-color: #fff;
-    }
   }
+
+  .ant-tooltip-arrow::before {
+    background-color: #fff;
+  }
+}
 </style>
 <style scoped lang="less">
 
-  .box {
-    padding: 0 0 0 18px;
-    box-sizing: border-box;
-  }
+.box {
+  padding: 0 0 0 18px;
+  box-sizing: border-box;
+}
 
-  .checkbox-left {
-    float: left;
-    position: absolute;
-    left: 0;
-    top: 50%;
-    transform: translateY(-50%);
-  }
+.checkbox-left {
+  float: left;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
 
-  .text-text-right {
-    padding: 19px 28px;
-    box-sizing: border-box;
-    margin-left: 38px;
-    cursor: pointer;
-  }
+.text-text-right {
+  padding: 19px 28px;
+  box-sizing: border-box;
+  margin-left: 38px;
+  cursor: pointer;
+}
 
-  .null-input {
-    background-color: #F2F4F8;
-  }
+.null-input {
+  background-color: #F2F4F8;
+}
 
-  .search-text-title {
-    margin-bottom: 22px;
-  }
+.search-text-title {
+  margin-bottom: 22px;
+}
 
-  .text-header {
-    margin-bottom: 11px;
+.text-header {
+  margin-bottom: 11px;
 
-    .text-header-text {
-      margin-right: 52px;
-      font-size: 16px;
-      font-weight: bold;
-      color: #040B29;
-      display: inline-block;
-      max-width: 220px;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-
-    /*span {*/
-    /*  margin-right: 52px;*/
-    /*  font-size: 16px;*/
-    /*  font-weight: bold;*/
-    /*  color: #040B29;*/
-    /*  display: inline-block;*/
-    /*  max-width: 500px;*/
-    /*  text-overflow: ellipsis;*/
-    /*  white-space: nowrap;*/
-    /*  overflow: hidden;*/
-    /*}*/
-  }
-
-  .text-content {
-    font-size: 14px;
-    font-weight: 400;
+  .text-header-text {
+    margin-right: 52px;
+    font-size: 16px;
+    font-weight: bold;
     color: #040B29;
-    opacity: 0.7;
-    overflow: hidden;
-    display: -webkit-box;
+    display: inline-block;
+    max-width: 220px;
     text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 4;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
+    white-space: nowrap;
+    overflow: hidden;
   }
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
+  /*span {*/
+  /*  margin-right: 52px;*/
+  /*  font-size: 16px;*/
+  /*  font-weight: bold;*/
+  /*  color: #040B29;*/
+  /*  display: inline-block;*/
+  /*  max-width: 500px;*/
+  /*  text-overflow: ellipsis;*/
+  /*  white-space: nowrap;*/
+  /*  overflow: hidden;*/
+  /*}*/
+}
 
-  .noData {
-    width: 100%;
-    text-align: center;
-    line-height: 10;
-  }
+.text-content {
+  font-size: 14px;
+  font-weight: 400;
+  color: #040B29;
+  opacity: 0.7;
+  overflow: hidden;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  /*! autoprefixer: off */
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  /*! autoprefixer: on;*/
+  text-justify: inter-ideograph;
+  word-break: break-all
+}
 
-  ::v-deep p {
-    margin: 0;
-    padding: 0;
-  }
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.noData {
+  width: 100%;
+  text-align: center;
+  line-height: 10;
+}
+
+::v-deep p {
+  margin: 0;
+  padding: 0;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue
index 9d8801182..69d0ab7c0 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue
@@ -19,7 +19,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="projectVersion">
                 <a-input class="box-input"
-                         :disabled="true"
+                         oninput="javascript:this.value=this.value.replace(/[^\d]$/g,'')"
+                         :maxLength="2"
                          v-model="formInline.projectVersion"
                          :placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
               </a-form-model-item>

From a34d0f908ef10b2aa04b950fd9cd676e1844ccf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 22 Mar 2023 09:18:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=B7=E9=87=8D=E5=A4=8D=E5=90=8E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 34 ++++++++++++++++++-
 2 files changed, 34 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 2a9e6a82e..d635e1228 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
@@ -9719,7 +9719,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String dueDate = null;
 
 			QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
-			queryProjectTaskInventoryWrapper.isNotNull("design_p_id");
+			queryProjectTaskInventoryWrapper.isNotNull("design_p_id").or().isNotNull("verify_p_id");
 			queryProjectTaskInventoryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryId);
 			List<ProjectTaskInventoryEO> list = projectTaskInventoryEOService.list(queryProjectTaskInventoryWrapper);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 4e2cfb5af..166d8d121 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -221,6 +221,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	}
 
+
+
 	/**
 	 * 项目扩展(添加子项目--子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
 	 * @param projectLibraryBase
@@ -239,8 +241,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		projectLibraryBaseTemp.setExplanation(projectLibraryBase.getExplanation());
 		this.save(projectLibraryBaseTemp);
 
-		Date now = new Date();
+		//处理版本号排序问题，如果版本号插入到中间，后面版本数字顺眼
+		checkVersionOrder(id,projectLibraryBase.getProjectVersion(),projectId);
 
+		Date now = new Date();
 		//相关人员名单中添加数据
 		List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id,
 				DictCodeEnum.DUTY_TERRITORY.getValue(),
@@ -339,6 +343,33 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		}
 	}
 
+	/**
+	 * 如果创建的子项目版本号重复，处理排序
+	 * @param id
+	 * @param version
+	 * @param projectId
+	 */
+	private void checkVersionOrder(String id,String version,String projectId) {
+		LambdaQueryWrapper<ProjectLibraryBase> wrapperVer = new LambdaQueryWrapper<>();
+		//查找其他统计子版本项目
+		wrapperVer.eq(ProjectLibraryBase::getParentId, id);
+		wrapperVer.orderByAsc(ProjectLibraryBase::getProjectVersion);
+		List<ProjectLibraryBase> clist = this.list(wrapperVer);
+		int tmpInt = Integer.parseInt(version);
+		for (ProjectLibraryBase plb : clist) {
+			int ver = Integer.parseInt(plb.getProjectVersion());
+			if(!plb.getId().equals(projectId) && ver == tmpInt){
+				tmpInt++;
+				String verStr = String.valueOf(tmpInt);
+				if(verStr.length() <= 1){
+					verStr= "0" + verStr;
+				}
+				plb.setProjectVersion(verStr);
+				this.updateById(plb);
+			}
+		}
+	}
+
 
 	/**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
 	public void checkExitData(ProjectLibraryBase projectLibraryBase){
@@ -379,6 +410,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		checkExitData(projectLibraryBase);
 		saveOrUpdate(projectLibraryBase);
+		checkVersionOrder(projectLibraryBase.getParentId(),projectLibraryBase.getProjectVersion(),projectLibraryBase.getId());
 
 		// 删除当前项目的studio与项目库 角色关系
 		QueryWrapper<ProjectLibraryRoleRelEO> deleteLibraryRoleRelWrapper = new QueryWrapper<>();