修正已接任务的合并

修正已接任务的合并和部分bug处理
fixed smallbug
Revert "修正已接任务的合并"

This reverts commit 7975934cda680c2dba19d0d860b8b417976a3f50.
Revert "fixed smallbug"

This reverts commit fecda1e639b05625ddcde2e418e3d01b54782db5.
fixed database