From bfe7b3974a11251b0d4b3fa58f313b9877e12178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 10 Nov 2022 16:19:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 08529934a..c754251e4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1211,7 +1211,7 @@ module.exports = { Inthecollection: 'During collection', Notatthe: 'Not started', Thepercentage: 'The Percentage', - problemKnowledgeBase: 'Q&A Knowledge', + problemKnowledgeBase: 'Knowledge Sharing', recentHotSpots: 'Recent Hot Spots', disseminationMaterials: 'Dissemination Materials', informationSafety: 'Information Safety', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 63891c8d9..af3986456 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1313,7 +1313,7 @@ module.exports = { Inthecollection: '收集中', Notatthe: '未开始', Thepercentage: '百分比', - problemKnowledgeBase: '问题知识库', + problemKnowledgeBase: '知识分享', recentHotSpots: '近期热点', disseminationMaterials: '传播物料', informationSafety: '信息安全', From ce03a575f6326cc960d4391f27af5da9fd2f7983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 10 Nov 2022 16:40:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c754251e4..2049d8217 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1028,7 +1028,7 @@ module.exports = { viewProcess: 'View Process', evaluationResults: 'Evaluation Results', Assessor: 'Assessor', - collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions', + collectionOfRegulatoryOpinions: 'Opinion Collection of Regulation', collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process', feedbackInformation: 'Feedback', relevantSections: 'Chapter', @@ -1291,8 +1291,8 @@ module.exports = { rejectedBy:'Rejected By', rejectionTime:'Rejection Time', rejectReason:'Reject Reason', - collectionLegislativeComments:'Collection of Legislative Comments', - regulatoryAndTechnicalAssessment:'Regulatory and technical assessment', + collectionLegislativeComments:'Opinion Collection of Regulation', + regulatoryAndTechnicalAssessment:'Regulation Technical Assessment', listConfirmationRejectionReason:'List confirmation rejection reason', taskConfirmationRejectionReason:'Task confirmation rejection reason', onlyCompletedDataCanBeDeleted:'Only completed data can be deleted', From 6d5026b320d3bb9dfb4af70f23d33d1974b48bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 10 Nov 2022 20:38:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 5 +++-- .../components/problemKnowledgeBaseListView.vue | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 281dffe9e..f25fcd950 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -211,7 +211,8 @@ downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', pageNo: 1, url: { - getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page', + getjiekou: '/problemKnowledgeBase/problemKnowledgeBaseEO/queryById' }, CommentQuery: {} } @@ -424,7 +425,7 @@ this.$nextTick(() => { this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(val))) }) - } + }, } } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 511849faa..cd452ed81 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -34,8 +34,10 @@ {{queryForm.createBy}}
- - {{queryForm.standNumber}} +
+ + {{value}} +
@@ -447,6 +449,14 @@ this.queryForm = row this.$refs.SelectedByRef.getPush() }, + detailClick(item,key) { + this.$router.push({ + path: '/docManage/library/detail', + query: { + id: item.bussDocumentLibraryId.split(',')[key] + }, + }) + }, SelectedByForm(userIds) { let query = { userIds: userIds, From db04a93b4078d7eb296469a8b914532e5b70e57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 11 Nov 2022 09:17:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- .../modules/searchcenter/enums/ModuleTypeFlagEnum.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 474832c10..03c26a557 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -196,15 +196,15 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl stringMapEn = new HashMap<>(); this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEn); - this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCn,SEARCH_FLAG,"问题知识库"); - this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEn,SEARCH_FLAG,"Problem knowledge base"); + this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCn,SEARCH_FLAG,"知识分享"); + this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEn,SEARCH_FLAG,"Knowledge Sharing"); Map stringMapCnBase = new HashMap<>(); this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapCnBase); Map stringMapEnBase = new HashMap<>(); this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEnBase); - this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCnBase,null,"问题知识库"); - this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEnBase,null,"Problem knowledge base"); + this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCnBase,null,"知识分享"); + this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEnBase,null,"Knowledge Sharing"); mapListTempCn.add(stringMapCn); mapListTempEn.add(stringMapEn); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java index dd0b61d4b..fd9c7f0e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java @@ -3,7 +3,7 @@ package com.jero.modules.searchcenter.enums; public enum ModuleTypeFlagEnum { DOCUMENT_LIBRARY("文档库","WDK"), LAWS_MONTHLY_REPORT("法规月报","FGYB"), - PROBLEM_KNOWLEDGE_BASE_CLASSIFY("问题知识库","WTZSK"); + PROBLEM_KNOWLEDGE_BASE_CLASSIFY("知识分享","WTZSK"); String name; String value; From dc967e7066a8fe3b8c0e4a3caf7bfe6947071880 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 11 Nov 2022 10:37:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/dashboard/components/myList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 7a62e70d5..a3f743475 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -94,7 +94,7 @@ }, moreClick() { this.$router.push({ - path: '/ProcessCenter' + path: '/projectRegulationTasks' }) }, prcClick(row) { From 9c88a2b6154d88c16a7a726cd212cc40873f99b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 11 Nov 2022 12:31:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E6=90=9C=E7=B4=A2null=E7=9A=84id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DocumentSearchServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 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 1be72fe12..03e90bafc 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 @@ -1488,7 +1488,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { List problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); if(CollectionUtils.isNotEmpty(problemKnowledgeBaseUserEOList)){ - List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().filter(e->{ + boolean flag = false; + if(StringUtils.isNotEmpty(e.getProblemKnowledgeBaseId())){ + flag = true; + } + return flag; + }).map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); //in查询该用户拥有权限的问题知识库id。 Map fieldKeyMap2 = new HashMap<>();