diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index 9a0ee323..b86a3809 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -150,6 +150,9 @@ public class WorkerController extends BaseController { Worker worker = new Worker(); worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null); worker.setName(workerListRequest.getWorkerName()); + if(this.getSysUser().getDept().getParentId() != 101){ + worker.setDeptId(this.getSysUser().getDept().getParentId()); + } List list = workerService.getWorkList(worker); list.forEach(w -> { Goods goods = new Goods(); diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index ac45bde8..cd542509 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -44,6 +44,9 @@ LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id + + AND dept_id = #{deptId} + AND open_id = #{openId}