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

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseGgpFacilityServiceImpl.java

@@ -33,7 +33,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     @Override
     public List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO) {
         List<BaseGgpFacility> list = new ArrayList<>();
-        if ((baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==39 && baseGgpFacilityVO.getFacilityType().get(0)==42) || (baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==42 && baseGgpFacilityVO.getFacilityType().get(0)==39)){
+        if (baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==39 && baseGgpFacilityVO.getFacilityType().get(0)==42){
             LambdaQueryWrapper<BaseGgpFacility> query1 = Wrappers.lambdaQuery();
             query1.select(BaseGgpFacility::getId,BaseGgpFacility::getFacilityName,BaseGgpFacility::getAddress,
                     BaseGgpFacility::getFacilityType,BaseGgpFacility::getLongitude,BaseGgpFacility::getLatitude,