deal empty data
Merge branch 'develop'

fix empty data bug