app根据设施服务找设施

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/facilities/FacilitiesController.java

@@ -327,20 +327,24 @@ public class FacilitiesController extends EnvelopRestEndpoint {
        if (StringUtils.isNotEmpty(facilityServerCodes)) {
            String[] faServerCodes = facilityServerCodes.split(",");
            List<String> facilityCodeList = facilityService.getFacilityCodeByServerCode(faServerCodes);
            facilityList = facilityService.getFacilityByFacilityCode(facilityCodeList);
            if (null != facilityCodeList && facilityCodeList.size() > 0) {
                facilityList = facilityService.getFacilityByFacilityCode(facilityCodeList);
            }
        } else if (StringUtils.isNotEmpty(facilityServerType)) {
            //设施编码为空，设施服务类型不为空，按设施服务类型获取设施
            List<String> facilityCodeList = facilityService.getFacilityCodeByServerType(facilityServerType);
            facilityList = facilityService.getFacilityByFacilityCode(facilityCodeList);
            if (null != facilityCodeList && facilityCodeList.size() > 0) {
                facilityList = facilityService.getFacilityByFacilityCode(facilityCodeList);
            }
        } else if (StringUtils.isNotEmpty(facilityCategory)) {
            //设施编码为空，设施服务类型为空，按照设施分类获取按设施服务类型获取设施
            filters = "category=" + facilityCategory + ";status=0;";
            facilityList = facilityService.search(fields, filters, sorts);
        } else {
            if(StringUtils.isEmpty(filters)){
            if (StringUtils.isEmpty(filters)) {
                filters = "status=0;";
            }else{
                filters = filters+ ";status=0;";
            } else {
                filters = filters + ";status=0;";
            }
            facilityList = facilityService.search(fields, filters, sorts);
        }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facility/FacilityDao.java

@@ -22,7 +22,7 @@ public interface FacilityDao extends JpaRepository<Facility, String> {
    Facility findByCode(String code);
    @Query("select f from Facility f where f.code in (:code) and status=0")
    @Query("select f from Facility f where  f.status = 0 and f.code in (:code) ")
    List<Facility> findByCode(@Param("code") List<String> code);
}