设备，外设单元修改

唐耀东

2022-02-07 afb22090c509befbf68e7aaef00f06795d11337d

 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;
            }
        }
    }

@@ -154,6 +158,9 @@
        if (StringUtils.isNotBlank(bo.getHostId())) {
            po.setHostId(bo.getHostId());
        }
        if(StringUtils.isNotBlank(bo.getEdition())){
            po.setEdition(bo.getEdition());
        }
//        if (StringUtils.isEmpty(bo.getNetworkId())) {
//            po.setNetworkId(bo.getNetworkId());
//        }