|
@@ -1345,7 +1345,7 @@ ORDER BY
|
|
|
|
|
|
var groupDatas = await _sqlSugar.SqlQueryable<EnterExitCostGroupNameView>(groupSql).ToArrayAsync();
|
|
|
var provCityDatas = await ProvinceCityBasicSource();
|
|
|
- if (provCityDatas.Any())
|
|
|
+ if (provCityDatas.Any() && groupDatas.Any())
|
|
|
{
|
|
|
foreach (var item in groupDatas)
|
|
|
{
|
|
@@ -1353,11 +1353,15 @@ ORDER BY
|
|
|
var isDefualtVal = true;
|
|
|
if (provinceId > 0)
|
|
|
{
|
|
|
- var parentId = FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
- if (parentId != null)
|
|
|
+ Console.WriteLine(item.Id);
|
|
|
+ if (item.Id == 2778)
|
|
|
{
|
|
|
- isDefualtVal = false;
|
|
|
- item.ProvinceId = (int)parentId;
|
|
|
+ var parentId = FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
+ if (parentId != null)
|
|
|
+ {
|
|
|
+ isDefualtVal = false;
|
|
|
+ item.ProvinceId = (int)parentId;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1381,15 +1385,18 @@ ORDER BY
|
|
|
{
|
|
|
foreach (var node in tree)
|
|
|
{
|
|
|
- if (node.Child.Any(c => c.Id == childId))
|
|
|
+ if (node.Child != null && node.Child.Any())
|
|
|
{
|
|
|
- return node.Id;
|
|
|
- }
|
|
|
+ if (node.Child.Any(c => c.Id == childId))
|
|
|
+ {
|
|
|
+ return node.Id;
|
|
|
+ }
|
|
|
|
|
|
- var parentId = FindParentIdByChildId(node.Child, childId);
|
|
|
- if (parentId.HasValue)
|
|
|
- {
|
|
|
- return parentId;
|
|
|
+ var parentId = FindParentIdByChildId(node.Child, childId);
|
|
|
+ if (parentId.HasValue)
|
|
|
+ {
|
|
|
+ return parentId;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|