森林防火
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-07-30 6149443e383fe700aec231bbdea6460230e75d9f 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java


@@ -39,7 +39,7 @@


        Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());


        LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();


        if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){


            wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());


            wrapper.like(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());


        }


        if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getType()!=0){


        wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType());


@@ -51,6 +51,7 @@


        List<SlEquipmentVO> list = slEquipmentVOPageDTO.getList();


        for (SlEquipmentVO sl:list){


            SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(sl.getManagementId());


            sl.setStoreManagementName(slStoreManagement.getStoreManagementName());


            sl.setCountyCode(slStoreManagement.getCountyCode());


            sl.setProvinceName(slStoreManagement.getProvinceName());


            sl.setProvinceCode(slStoreManagement.getProvinceCode());


@@ -101,6 +102,7 @@




        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());


        slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());


        slEquipmentVO.setStoreManagementName(slStoreManagement.getStoreManagementName());


        slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());


        slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());


        slEquipmentVO.setCountyName(slStoreManagement.getCountyName());