update:fix bugs when rules has no || or &&
Merge branch 'admin_second' of https://github.com/minchina/node_webpos into admin_second