需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/es/EsLogic.java

@@ -51,10 +51,10 @@ public class EsLogic {
             must.must(QueryBuilders.termQuery("comListId", comId));
         }
         if(StringUtils.isNotEmpty(workerNumber)){
-            must.must(QueryBuilders.termQuery("workerNumber", workerNumber));
+            must.must(QueryBuilders.matchPhraseQuery("workerNumber", workerNumber));
         }
         if(CollectionUtils.isNotEmpty(websitNumbers)){
-            must.must(QueryBuilders.termsQuery("websitNumber",websitNumbers));
+            must.must(QueryBuilders.matchPhraseQuery("websitNumber",websitNumbers));
         }
         NativeSearchQuery titleBuild = new NativeSearchQueryBuilder().withQuery(titleQueryBuilder).build();
         NativeSearchQuery dataBuild = new NativeSearchQueryBuilder().withQuery(must).build();

mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/WorkerComListLogic.java

@@ -10,14 +10,8 @@ import com.gree.mall.manager.bean.es.CommonListES;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.es.EsLogic;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.WorkerComList;
-import com.gree.mall.manager.plus.entity.WorkerComListWebsit;
-import com.gree.mall.manager.plus.entity.WorkerComListWorker;
-import com.gree.mall.manager.plus.service.AdminWebsitService;
-import com.gree.mall.manager.plus.service.WorkerComListService;
-import com.gree.mall.manager.plus.service.WorkerComListWebsitService;
-import com.gree.mall.manager.plus.service.WorkerComListWorkerService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.utils.oss.OSSUtil;
@@ -56,6 +50,8 @@ public class WorkerComListLogic {
     WorkerComListWebsitService workerComListWebsitService;
     @Autowired
     AdminWebsitService adminWebsitService;
+    @Autowired
+    WebsitUserService websitUserService;
 
 
     /**
@@ -74,8 +70,12 @@ public class WorkerComListLogic {
             comListIds = worker.stream().map(WorkerComListWorker::getWorkerComListId).distinct().collect(Collectors.toList());
         } else {
             //以登录人为准
+            List<WebsitUser> websitUsers = websitUserService.lambdaQuery()
+                    .in(WebsitUser::getWebsitId, adminUser.getAdminWebsitIds()).select(WebsitUser::getWorkerNumber).list();
+            List<String> collect = websitUsers.stream().map(WebsitUser::getWorkerNumber).collect(Collectors.toList());
+
             List<WorkerComListWebsit> websit = workerComListWebsitService.lambdaQuery()
-                    .in(WorkerComListWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                    .in(!CollectionUtils.isEmpty(collect),WorkerComListWebsit::getWebsitId,collect)
                     .list();
             if (CollectionUtils.isEmpty(websit)) {
                 return new Page<>(pageNum, pageSize);

mall-server-api/src/main/java/com/gree/mall/manager/logic/es/EsLogic.java

@@ -49,15 +49,13 @@ public class EsLogic {
             CommonUtils.initList2(rows,rows.size());
             List<Object> row = (List<Object>) rows.get(i);
             String workerNumber = (String)row.get(0);
-            if(StringUtils.isEmpty(workerNumber) || (i > 0 && workerNumber.length() < 8)){
+            if(StringUtils.isEmpty(workerNumber)){
                 break;
             }
             CommonListES commonListES = new CommonListES();
             commonListES.setType(i==0?"1":"2");
             commonListES.setWorkerNumber(workerNumber);
-            if(workerNumber.length() >= 8) {
-                commonListES.setWebsitNumber(workerNumber.substring(0, 8));
-            }
+            commonListES.setWebsitNumber(workerNumber);
             commonListES.setComListId(comListId);
             
             for(int x = start;x <= row.size();x++) {
@@ -89,10 +87,10 @@ public class EsLogic {
             must.must(QueryBuilders.termQuery("comListId", comId));
         }
         if(StringUtils.isNotEmpty(workerNumber)){
-            must.must(QueryBuilders.termQuery("workerNumber", workerNumber));
+            must.must(QueryBuilders.matchPhraseQuery("workerNumber", workerNumber));
         }
         if(CollectionUtils.isNotEmpty(websitNumbers)){
-            must.must(QueryBuilders.termsQuery("websitNumber",websitNumbers));
+            must.must(QueryBuilders.matchPhraseQuery("websitNumber",websitNumbers));
         }
         NativeSearchQuery titleBuild = new NativeSearchQueryBuilder().withQuery(titleQueryBuilder).build();
         NativeSearchQuery dataBuild = new NativeSearchQueryBuilder().withQuery(must).build();