xiugai错误

yangys

2025-06-12 c62be3b61c4548c2d7a33df5d46e6a754b04ceca

xiugai错误

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java

@@ -30,7 +30,16 @@

        machine.setMachineSpec(vo.getMachineSpec());
        machine.setName(vo.getName());
        machine.setMachineGroupId(vo.getMachineGroupId());
        machine.setMachineGroupCode(vo.getMachineGroupCode());
        machine.setManufacturer(vo.getManufacturer());
        machine.setOperator(vo.getOperator());
        machine.setControlSystem(vo.getControlSystem());
        machine.setOwnerDept(vo.getOwnerDept());
        machine.setPollingHours(vo.getPollingHours());
        machine.setProgSendDir(vo.getProgSendDir());
        machine.setProgReceiveDir(vo.getProgReceiveDir());
        machine.setRemark(vo.getRemark());

        return this.updateById(machine);
    }

@@ -45,7 +54,7 @@
    public IPage<MachineVO> pageQuery(MachineQueryVO query) {

        LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(query.getMachineGroupId()!=null, Machine::getMachineGroupId, query.getMachineGroupId());
        queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
        IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);

        //MachineSpec.valueOf()