ES调整

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java

@@ -13,7 +13,7 @@ public class QueryOrgReq {
     private String orgCode;
     @NotNull(message = "组织机构不能为空",groups = {ValidationApi.detail.class})
     private Long orgId;
-    private Long currentOrg;
+    private String currentOrg;
     private String orgName;
     private Long parentId;
     private Integer isDepartment;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.PubOrgRepository;
 import com.junmp.jyzb.api.bean.dto.*;
@@ -377,7 +378,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
      * @return
      * @throws IOException
      */
-    public List<PubOrg> searchOrg(Integer pageNum, Integer pageSize, String keyword, Long currentOrg) throws IOException {
+    public List<PubOrg> searchOrg(Integer pageNum, Integer pageSize, String keyword, String currentOrg) throws IOException {
         if (pageNum < 0) pageNum = 0;
 
         SearchRequest request = new SearchRequest("org_pinyin");
@@ -397,8 +398,11 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
         // 添加过滤条件，orgParentIds 包含当前字段，或者 orgId 等于当前字段
         BoolQueryBuilder orgFilter = QueryBuilders.boolQuery();
+        if (StringUtils.isNotBlank(currentOrg) )
+        {
         orgFilter.should(QueryBuilders.wildcardQuery("orgParentIds", "*" + currentOrg + "*"));
         orgFilter.should(QueryBuilders.termQuery("orgId", currentOrg.toString()));
+        }
         boolQueryBuilder.filter(orgFilter);
 
         builder.query(boolQueryBuilder);
@@ -552,7 +556,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
 
         // 先进行搜索，获取前20条数据
-        List<PubOrg> searchResults = searchOrg(0, 20, req.getOrgName(),req.getCurrentOrg());
+        List<PubOrg> searchResults = searchOrg(0, 20, req.getOrgName(), req.getCurrentOrg());
         req.setDelFlag(1);
         // 获取所有组织机构数据
         List<PubOrg> orgsAll=searchAll(0, 3000);