From feb2bee79e19831721c413c5935e2287fd80c774 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Tue, 16 May 2023 11:25:14 +0800
Subject: [PATCH] =?UTF-8?q?PC=20=E5=B8=88=E5=82=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/worker/WorkerController.java   | 3 +++
 ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml   | 3 +++
 2 files changed, 6 insertions(+)

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<Worker> 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
             <where>
+                <if test="deptId != null and deptId != ''">
+                    AND dept_id = #{deptId}
+                </if>
                 <if test="openId != null and openId != ''">
                     AND open_id = #{openId}
                 </if>