Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/home.ftl

@@ -467,7 +467,11 @@
                         if (uptownId == '1238790987234') {
                             html += '<option value="' + data[i].unitId + '">'+data[i].ridgepole+data[i].unit + '</option>';
                         } else {
-                            html += '<option value="' + data[i].unitId + '">'+data[i].ridgepole+'栋'+data[i].unit+'单元' + '</option>';
+                            if (data[i].ridgepole == "") {
+                                html += '<option value="' + data[i].unitId + '">'+data[i].unit+'单元' + '</option>';
+                            } else {
+                                html += '<option value="' + data[i].unitId + '">'+data[i].ridgepole+'栋'+data[i].unit+'单元' + '</option>';
+                            }
                         }
                     }
                     $('#unitId').append(html);