From cb74cb0533313871631119b206dfeba838e9dda2 Mon Sep 17 00:00:00 2001 From: Echo <4759156@qq.com> Date: Thu, 17 Jul 2025 16:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=BE=97=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=8E=82=E5=8C=BA=E5=BE=97=E5=91=98=E5=B7=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=91=98=E5=B7=A5=E5=A7=93?= =?UTF-8?q?=E5=90=8D=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 --- .../controller/admin/staff/StaffController.java | 5 +++-- .../module/smartfactory/service/staff/StaffService.java | 2 +- .../smartfactory/service/staff/StaffServiceImpl.java | 8 ++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java index 40570e71..272ae72b 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java @@ -99,8 +99,9 @@ public class StaffController { @Parameter(name = "factoryId", description = "厂区编号", required = true, example = "1024") @Parameter(name = "isIn", description = "是否获取该厂区得员工", required = true, example = "1024") public CommonResult> getListByFactory(@RequestParam("factoryId") Long factoryId, - @RequestParam("isIn") Boolean isIn) { - List staffs = staffService.getListByFactory(factoryId, isIn); + @RequestParam("isIn") Boolean isIn, + @RequestParam(value = "name",required = false) String name) { + List staffs = staffService.getListByFactory(factoryId, isIn, name); return success(BeanUtils.toBean(staffs, StaffRespVO.class)); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java index 2246c9ca..e8517205 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java @@ -90,7 +90,7 @@ public interface StaffService { * @param isIn 是否获取该厂区员工 * @return 员工列表 */ - List getListByFactory(Long factoryId, Boolean isIn); + List getListByFactory(Long factoryId, Boolean isIn, String name); List getListByFactory(Long factoryId, Boolean isIn, List workTypeIds); diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java index cc31986b..3f2d1689 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java @@ -249,8 +249,12 @@ public class StaffServiceImpl implements StaffService { } @Override - public List getListByFactory(Long factoryId, Boolean isIn) { - return this.getListByFactory(factoryId, isIn, null); + public List getListByFactory(Long factoryId, Boolean isIn, String name) { + return staffMapper.selectList(new LambdaQueryWrapperX() + .eq(isIn, StaffDO::getFactoryId, factoryId) + .ne(!isIn, StaffDO::getFactoryId, factoryId) + .ne(StaffDO::getStatus, 0) + .like(StaffDO::getNickName, name)); } @Override