Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -130,6 +130,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         LambdaQueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseGgpFacility::getFacilityNum,requestVO.getFacilityNum())
                 .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseGgpFacility::getFacilityType,requestVO.getFacilityType())
+                .like(StringUtils.isNotBlank(requestVO.getFacilityName()),BaseGgpFacility::getFacilityType,
+                        requestVO.getFacilityName())
                 .eq(BaseGgpFacility::getTenantId,SecurityUtils.getTenantId());
         page = baseGgpFacilityService.page(page,queryWrapper);
         if(CollectionUtils.isNotEmpty(page.getRecords())){
@@ -151,10 +153,11 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
 
                 if(page.getRecords().get(i).getId().equals(buildFacilityId)){
                     responeVO.setStatus(1);
+                    list.add(0, responeVO);
                 }else{
                     responeVO.setStatus(0);
+                    list.add(responeVO);
                 }
-                list.add(responeVO);
             }
         }
         return new CommonPage<>(list,page.getTotal(),page.getSize(),page.getCurrent());

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BuildFacilityRelateRequestVO.java

@@ -23,6 +23,11 @@ public class BuildFacilityRelateRequestVO {
      */
     private String facilityNum;
 
+    /**
+     * 设施名称
+     */
+    private String facilityName;
+
     /**
      * 设施类型编码
      */