Commit 309e58bf authored by tianyiming's avatar tianyiming

修改bug

parent 85589c46
......@@ -861,6 +861,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
QueryBuilders.boolQuery().mustNot(existsQuery(nestedField)),
ScoreMode.None
);
NestedQueryBuilder noneQuery = QueryBuilders.nestedQuery(
path,
QueryBuilders.boolQuery().mustNot(existsQuery(path)),
ScoreMode.None
);
enhancedDynamicQueryBuilder.add(noneQuery, or);
enhancedDynamicQueryBuilder.add(nestedQuery, or);
}
} else {
......
......@@ -422,6 +422,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
baseEnterpriseInfo.setUseContact(regUnitInfo.getName());
baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel());
} else {
baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
......
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