配置工具修改

唐耀东

2021-12-31 9b3d5e47568ac430a7a544297cfa7d1a77186e86

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java

@@ -129,15 +129,19 @@
        }
        // 设备不存在则新建
        else {
            // 先根据序列码生成序列号
            DevEquipmentCode c = new DevEquipmentCode();
            c.setCreateTime(DateUtils.getNowDate());
            devEquipmentCodeMapper.insert(c);
            // 添加设备
            DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
            add.setSerialNumber(c.getId());
            baseMapper.insert(add);
            return add;
            if(bo.isRegister()) {
                // 先根据序列码生成序列号
                DevEquipmentCode c = new DevEquipmentCode();
                c.setCreateTime(DateUtils.getNowDate());
                devEquipmentCodeMapper.insert(c);
                // 添加设备
                DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
                add.setSerialNumber(c.getId());
                baseMapper.insert(add);
                return add;
            }else{
                return po;
            }
        }
    }