From d472bbc021162677f7a645abebb15077cb0e40e7 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 22 Oct 2022 14:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=B9=E5=85=A8=E6=96=87?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/elasticsearc/CourseElasticsearchImpl.java | 5 +++++ .../src/main/resources/application-pro.properties | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index a18d4058..2cb5b843 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -280,6 +280,11 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(StringUtils.isNotBlank(params.getSysType3())) { boolQuery.filter(QueryBuilders.termQuery("sysType3", params.getSysType3())); } + //增加companyId过滤 + if(StringUtils.isNotBlank(params.getCompanyId())) { + boolQuery.filter(QueryBuilders.termQuery("companyId", params.getCompanyId())); + } + //加上Source判断，是为了应对后台查询，后台查询时，不需要权限，但是需要指定数据来源 if(params.getSource()==null || params.getSource()==0 ) { diff --git a/servers/org-user-sync/src/main/resources/application-pro.properties b/servers/org-user-sync/src/main/resources/application-pro.properties index d1dfbd92..b5ecc024 100644 --- a/servers/org-user-sync/src/main/resources/application-pro.properties +++ b/servers/org-user-sync/src/main/resources/application-pro.properties @@ -14,7 +14,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver # 原数据库 old 对应的数据库 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver -spring.datasource.db1.jdbc-url=jdbc:mysql://10、251、129.126:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.db1.username=admin spring.datasource.db1.password=boeRds01 @@ -23,7 +23,7 @@ spring.datasource.db1.password=boeRds01 # 新主数据库 all 对应的数据库 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.db2.jdbc-url=jdbc:mysql://10、251、129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.db2.username=admin spring.datasource.db2.password=boeRds01