修正bug.updated both
处理null问题，updated both.