提交订单工模糊查询

hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java

@@ -116,7 +116,7 @@ public class WorkerServiceImpl implements WorkerService {
                 Path<Integer> workerStatusField = root.get("workerStatus");
                 Path<String> signPersonField = root.get("signPerson");
                 Path<String> regionField = root.get("region");
-
+                Path<String> ownerCompanyField = root.get("ownerCompany");
 
 
                 List<Predicate> list = new ArrayList<>();
@@ -137,6 +137,10 @@ public class WorkerServiceImpl implements WorkerService {
                     list.add(cb.equal(regionField, worker.getRegion()));
                 }
 
+                if (StrUtil.isNotBlank(worker.getOwnerCompany())) {
+                    String[] transCompany = worker.getOwnerCompany().trim().split(",");
+                    list.add(ownerCompanyField.in(transCompany));
+                }
 
                 // 数据权限
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java

@@ -53,7 +53,7 @@ public class WorkerController {
     }
 
 
-    @RequestMapping(value = "/getByCondition", method = RequestMethod.GET)
+    @RequestMapping(value = "/getWXByCondition", method = RequestMethod.GET)
     @ApiOperation(value = "多条件获取订单列表-小程序")
     public Result<List<Worker>> getByCondition(@RequestBody WorkerQueryVO worker) {
         List<Worker> workerList = workerService.findByCondition(worker);