lius
2023-08-21 21caf8ad8e7d24c3bbf7cf4a90c35f51851fd6cb
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -469,6 +469,9 @@
            }
        }
        //根据产线集合查找所有设备id
        if (allDepartIds.isEmpty()) {
            return null;
        }
        List<String> equipmentIds = this.baseMapper.queryIdsByDeparts(allDepartIds);
        if (StringUtils.isNotEmpty(key)) {
            //key不为空,查询所有下级部门id
@@ -515,6 +518,9 @@
            }
        }
        //根据产线集合查找所有设备id
        if (allProductionIds.isEmpty()) {
            return null;
        }
        List<String> equipmentIds = this.baseMapper.queryIdsByProductions(allProductionIds);
        if (StringUtils.isNotEmpty(key)) {
            //key不为空,查询所有下级产线id
@@ -669,4 +675,16 @@
        return this.baseMapper.findEquProList(equipmentIdList);
    }
    /**
     * 根据部门层级查询设备单个
     */
    @Override
    public MdcEquipment getEquipmentByDepPid(String pid, String userId) {
        List<String> idsByDepart = this.getEquipmentIdsByDepart(userId, pid);
        if (idsByDepart != null && !idsByDepart.isEmpty()) {
            return super.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, idsByDepart.get(0)));
        }
        return null;
    }
}