From 86947cb8428af1a322bb59961f567296fdfaad93 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 10:51:27 +0800
Subject: [PATCH] 机床按机构查询功能开发
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
index 6d95ef7..2b32858 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -5,6 +5,7 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -12,6 +13,9 @@
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.pojo.entity.Dept;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,7 +27,8 @@
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
-
+ @Autowired
+ private ISysClient sysClient;
@Transactional
public void saveMachine(MachineSaveVO vo){
checkMachine(vo);
@@ -105,12 +110,14 @@
*/
public IPage<MachineVO> pageQuery(MachineQueryVO query) {
- LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
- //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
- //String keys = query.getKeyword();
+ if (query.getDeptId() != null) {
+ R<Dept> rs = sysClient.getDept(query.getDeptId());
+ if(rs.isSuccess()){
+ query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
+ }
+ }
+ IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query), query);
- //queryWrapper.and(StringUtils.isNotEmpty(keys), wrapper -> wrapper.like(Machine::getCode, keys).or().like(Machine::getName, keys));
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
return page;
}
--
Gitblit v1.9.3