Merge remote-tracking branch 'origin/energy-manage-shiyue'

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitServiceImpl.java

@@ -83,7 +83,9 @@ public class UnitServiceImpl implements UnitService {
 
     @Override
     public List<String> getBrandModelNameOrModelNumber(UnitDictBrandModelDto unitDictBrandModelDto) {
-
+        if(StringUtils.isEmpty(unitDictBrandModelDto.getManufacture())){
+           return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+        }
         String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, unitDictBrandModelDto.getManufacture());
         String val = cacheService.get(brandlistKey);
         if(StringUtils.isEmpty(val)){