Commit 0eb549d0 authored by 韩桐桐's avatar 韩桐桐

fix(jg):bug:18723

parent 136f9e75
......@@ -717,7 +717,7 @@ public class CommonServiceImpl implements ICommonService {
type = "all";
break;
}
List<Map<String, Object>> unitList = commonMapper.getUnitListByType(type);
List<Map<String, Object>> unitList = new ArrayList<>(Collections.emptyList());
// 检验检测机构 追加车用气瓶
if ("检验检测机构".equals(type) && "gasCylindersForCars".equals(business)) {
List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues("OLD_INSPECTION_TESTING_UNIT").getResult();
......@@ -727,6 +727,8 @@ public class CommonServiceImpl implements ICommonService {
List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues("OLD_INSTALLATION_UNIT").getResult();
result.forEach(x-> convertAndAddToUnitList(x, unitList));
}
List<Map<String, Object>> unitListByType = commonMapper.getUnitListByType(type);
unitList.addAll(unitListByType);
return unitList;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment