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