设施列表联调修改

takai-modules/takai-system/src/main/java/org/dromara/system/service/impl/FacilitiesServiceImpl.java

@@ -65,9 +65,21 @@ public class FacilitiesServiceImpl implements IFacilitiesService {
      */
     @Override
     public TableDataInfo<FacilitiesVo> queryPageList(FacilitiesBo bo, PageQuery pageQuery) {
+        Page<FacilitiesVo> result = new Page<>();
         if("0".equals(bo.getDictType()) || org.apache.commons.lang3.StringUtils.isBlank(bo.getDictType())){
             LambdaQueryWrapper<Facilities> lqw = buildQueryWrapper(bo);
-            Page<FacilitiesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        }else {
+            RegionBo s = new RegionBo();
+            s.setRegionType(bo.getDictType());
+            List<String> regionVoList = regionMapper.selectByRegionType(bo.getDictType());
+            if(regionVoList.size() > 0){
+                bo.setFacilitiesIds(regionVoList);
+                LambdaQueryWrapper<Facilities> lqw = buildQueryWrapper(bo);
+                result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            }
+        }
+        if(result != null){
             List<FacilitiesVo> list = result.getRecords();
             for (FacilitiesVo facilitiesVo: list){
                 List<SysImgVo> sysimg = this.querySysImg(facilitiesVo.getFacilitiesId());
@@ -80,29 +92,8 @@ public class FacilitiesServiceImpl implements IFacilitiesService {
                 facilitiesVo.setSysimg(sysimg);
             }
             return TableDataInfo.build(result);
-        }else{
-            RegionBo s = new RegionBo();
-            s.setRegionType(bo.getDictType());
-            List<String> regionVoList = regionMapper.selectByRegionType(bo.getDictType());
-            if(regionVoList.size() > 0){
-                bo.setFacilitiesIds(regionVoList);
-                LambdaQueryWrapper<Facilities> lqw = buildQueryWrapper(bo);
-                Page<FacilitiesVo> result2 = baseMapper.selectVoPage(pageQuery.build(), lqw);
-                List<FacilitiesVo> list = result2.getRecords();
-                for (FacilitiesVo facilitiesVo: list){
-                    List<SysImgVo> sysimg = this.querySysImg(facilitiesVo.getFacilitiesId());
-                    for (SysImgVo sysImgVo: sysimg){
-                        if(StringUtils.isNotBlank(sysImgVo.getEnumC()) && sysImgVo.getEnumC().equals("0")){
-                            facilitiesVo.setUrl(sysImgVo.getUrl());
-                            break;
-                        }
-                    }
-                    facilitiesVo.setSysimg(sysimg);
-                }
-                return TableDataInfo.build(result2);
-            }
-            return null;
         }
+        return TableDataInfo.build(result);
     }
 
     /**
@@ -122,7 +113,7 @@ public class FacilitiesServiceImpl implements IFacilitiesService {
         }
         lqw.like(StringUtils.isNotBlank(bo.getFacilitiesId()), Facilities::getFacilitiesId, bo.getFacilitiesId());
         lqw.like(StringUtils.isNotBlank(bo.getFacilitiesName()), Facilities::getFacilitiesName, bo.getFacilitiesName());
-        lqw.eq(StringUtils.isNotBlank(bo.getFacilitiesTitle()), Facilities::getFacilitiesTitle, bo.getFacilitiesTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getFacilitiesTitle()), Facilities::getFacilitiesTitle, bo.getFacilitiesTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getFacilitiesDesc()), Facilities::getFacilitiesDesc, bo.getFacilitiesDesc());
         return lqw;
     }