From f23f5e217fa1fa9e7c80a899567862c6c55fb61a Mon Sep 17 00:00:00 2001 From: Houpn Date: Wed, 30 Aug 2023 23:15:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=B7=A5?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java | 6 +++++- .../java/cc/hiver/mall/controller/WorkerController.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java index 297fa8e5..15d4e4e5 100644 --- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java @@ -116,7 +116,7 @@ public class WorkerServiceImpl implements WorkerService { Path workerStatusField = root.get("workerStatus"); Path signPersonField = root.get("signPerson"); Path regionField = root.get("region"); - + Path ownerCompanyField = root.get("ownerCompany"); List 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)); + } // 数据权限 diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java index 93ee6d1b..19cdcf35 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerController.java +++ b/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> getByCondition(@RequestBody WorkerQueryVO worker) { List workerList = workerService.findByCondition(worker);