* finish task #1965.
 * adjust code for task #1967.
Merge branch 'master' of github.com:easysoft/zentaopms