修改项

Lius

2025-05-15 5a0dbf5c84f677c9f20252ccc63221dc7ba68d6c

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

@@ -111,6 +111,9 @@
    @Transactional(rollbackFor = Exception.class)
    public void saveMdcEquipment(MdcEquipment mdcEquipment, String selectedDeparts, String selectedProduction) {
        //step.1 保存设备
        if (StringUtils.isBlank(mdcEquipment.getAttribute())) {
            mdcEquipment.setAttribute("0");
        }
        this.save(mdcEquipment);
        //step.2 保存所属部门
        if (oConvertUtils.isNotEmpty(selectedDeparts)) {
@@ -749,6 +752,9 @@
        if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
            queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
        }
        if (StringUtils.isNotBlank(vo.getAttribute())) {
            queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
        }
        List<MdcEquipment> list = super.list(queryWrapper);
//        List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
        return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());