* adjust code.
 * finish task #1578.
 * finish task #1579.
Merge branch 'master' of git@github.com:easysoft/zentaopms