From 531a88752aa022625a834c950f3a4575baa4f78a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 1 Sep 2022 10:22:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=AE=B5=E8=90=BD--=E5=A4=84=E7=90=86=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E6=AD=A3=E6=96=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchcenter/service/impl/DocumentSearchServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 50f5c7846..5ad385a16 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -997,7 +997,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         Map<String, Object> queryMapTemp = new HashMap<>();
                         Map<String, Object> queryMap3 = new HashMap<>();
                         //特殊处理编号字段
-                        if (key.equals("serial_number")){
+                        if (key.equals("serial_number") || key.equals("title") || key.equals("file_text")){
                             queryMapTemp.put(key, "*" + s + "*");
                             queryMap.put("wildcard",queryMapTemp);
                             queryMapJson.add(queryMap);

From b228cb9e19375fbed2862ac622ef53f96d4c1848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Thu, 1 Sep 2022 10:55:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/libraryPush/index.vue | 24 ++++++++++++++-----
 .../views/regulatoryEarlyWarning/index.vue    |  8 ++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index 05d1e547f..b07315fdd 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -63,15 +63,17 @@
         departId: '',
         defaultExpandedKeys: [],
         submitLoading: false,
-        visibleTree: false
+        visibleTree: false,
+        flag: ''
       }
     },
     mounted() {
 
     },
     methods: {
-      getPush(data) {
+      getPush(data, flag) {
         this.tableKey = data
+        this.flag = flag
         this.searchModel = ''
         this.visible = true
         this.visibleTree = false
@@ -99,10 +101,20 @@
         this.visibleTree = false
       },
       handleSubmit() {
-        let query = {
-          documentIds: this.tableKey.join(','),
-          userIds: this.userIds.join(','),
-          departIds: this.userIds.join(',')
+        let query = {}
+        if (this.flag) {
+          query = {
+            documentIds: this.tableKey.join(','),
+            userIds: this.userIds.join(','),
+            departIds: this.userIds.join(','),
+            flag: this.flag
+          }
+        } else {
+          query = {
+            documentIds: this.tableKey.join(','),
+            userIds: this.userIds.join(','),
+            departIds: this.userIds.join(',')
+          }
         }
         this.submitLoading = true
         this.confirmLoading = true
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index fcb5b468c..1629ad194 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -234,7 +234,13 @@
       handleCompare() {
         if (this.selectedRowKeys.length > 0) {
           this.$nextTick(() => {
-            this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+            let flag = ''
+            if (this.activeTab == this.$t('ImplementationDate')) {
+              flag = 1
+            } else {
+              flag = 2
+            }
+            this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)),flag)
           })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))