代码提交 bug解决

无关风月

2024-08-28 1c4311135628b53daa336821ff452292a9d063e9

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java

@@ -73,6 +73,7 @@
        if (slEquipmentDTO.getId()==null){
            List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>()
                    .eq("type", slEquipmentDTO.getType())
                            .eq("del_flag","0")
                    .eq("equipment_num", slEquipmentDTO.getEquipmentNum()));
            if (!list.isEmpty()){
                return AjaxResult.error("当前设备已存在相同设备编号");
@@ -82,12 +83,14 @@
            slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
            slEquipment.setType(slEquipmentDTO.getType());
            slEquipment.setManagementId(slEquipmentDTO.getManagementId());
            slEquipment.setCreateTime(new Date());
            this.save(slEquipment);
        }else{
            SlEquipment byId = this.getById(slEquipmentDTO.getId());
            List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>()
                    .eq("type", slEquipmentDTO.getType())
                    .ne("id",slEquipmentDTO.getId())
                            .eq("del_flag","0")
                    .eq("equipment_num", slEquipmentDTO.getEquipmentNum()));
            if (!list.isEmpty()){
                return AjaxResult.error("当前设备已存在相同设备编号");