Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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);

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 = {
+        let query = {}
-          documentIds: this.tableKey.join(','),
+        if (this.flag) {
-          userIds: this.userIds.join(','),
+          query = {
-          departIds: this.userIds.join(',')
+            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

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'))