森林防火 供应商管理

rentaiming

2024-07-25 454cb87bf4ecfae8a54e0afac1b2d8e9c58e9f62

 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());