* finish task#1604.
 * code for task#1604.
 * finish task#1441.
Merge branch 'master' of git@github.com:easysoft/zentaopms