Merge remote-tracking branch 'origin/master'

src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts

@@ -787,7 +787,10 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                     applicationid:'',
                     name:'全部'
                 }
-                this.itemTypeList.push(data);
+                if (null!=res.data){
+                    this.itemTypeList.push(data);
+                }
+
             }
         );
     }