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

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

@@ -94,7 +94,8 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
     public CommonPage<BaseBuildFacility> page(BaseBuildFacilityRequestVO requestVO){
         List<BaseBuildFacility> list = new ArrayList<>();
         LambdaQueryWrapper<BaseBuildFacility> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseBuildFacility::getFacilityNum,requestVO.getFacilityNum())
+        queryWrapper.eq(requestVO.getId() != null,BaseBuildFacility::getId,requestVO.getId())
+                .like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseBuildFacility::getFacilityNum,requestVO.getFacilityNum())
                 .like(StringUtils.isNotBlank(requestVO.getFacilityName()),BaseBuildFacility::getFacilityName,requestVO.getFacilityName())
                 .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseBuildFacility::getFacilityType,requestVO.getFacilityType())
                 .eq(BaseBuildFacility::getDeleteFlag,0)

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

@@ -9,11 +9,17 @@ public class BaseBuildFacilityRequestVO {
      * 页数
      */
     private Integer current;
+
     /**
      * 条数
      */
     private Integer size;
 
+    /**
+     * id
+     */
+    private Integer id;
+
     /**
      * 建筑名称
      */