修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/MaintenanceResourceDataController.java

@@ -8,6 +8,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.equipmanage.common.utils.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -197,7 +199,17 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         }
         page = maintenanceResourceDataService.page(pageBean, queryWrapper);
-        page.getRecords().stream().forEach(e->e.setLocation(e.getBuildingName() == null ? "" : e.getBuildingName()+e.getLocation() == null ? "" : e.getLocation()) );
+        page.getRecords().stream().forEach(e->{
+            String add = "";
+            if (!ValidationUtil.isEmpty(e.getBuildingName())){
+                 add = add+e.getBuildingName();
+             };
+             if (!ValidationUtil.isEmpty(e.getLocation())){
+                 add = add+e.getLocation();
+             }
+            e.setLocation(add);
+        }
+        );
         return page;
     }