Merge remote-tracking branch 'origin/open_v2' into open_v2

This commit is contained in:
2025-09-05 14:49:20 +08:00
@@ -117,7 +117,7 @@ public class AdministrativeMappingServiceImpl implements AdministrativeMappingSe
List<AdministrativeMapping> allByParams = administrativeMappingDao.findAllByParams(params);
if (allByParams != null && !allByParams.isEmpty()) {
if (allByParams.size() == 1) {
if (allByParams.size() >= 1) {
AdministrativeMapping firstByParams = allByParams.get(0);
return StringUtils.isBlank(firstByParams.getCityShort()) ? "" : firstByParams.getCityShort();
}