存放地点列表详细地址调整

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -100,7 +100,9 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         IPage<ScmWarehouse> page = PagerUtil.queryToPage(pq);
         IPage<ScmWarehouseVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmWarehouseVo record : pagging.getRecords()) {
-            record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+            if (StringUtils.isNotBlank(record.getCity()) && StringUtils.isNotBlank(record.getCounty())){
+                record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+            }
         }
         PagerVo<ScmWarehouseVo> p = PagerUtil.pageToVo(pagging, null);
         return p;