diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index b27a7048ce..a039b05d47 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -1,20 +1,30 @@
 <?php
 /* Fields. */
-$lang->program->name      = '项目集名称';
-$lang->program->template  = '项目集模板';
-$lang->program->category  = '项目集类型';
-$lang->program->desc      = '项目集描述';
-$lang->program->copy      = '复制项目集';
-$lang->program->status    = '状态';
-$lang->program->PM        = '负责人';
-$lang->program->budget    = '预算';
-$lang->program->progress  = '项目进度';
-$lang->program->children  = '子项目集';
-$lang->program->parent    = '父项目集';
-$lang->program->allInput  = '项目集总投入';
-$lang->program->teamCount = '总人数';
-$lang->program->longTime  = '长期';
-$lang->program->view      = '项目集详情';
+$lang->program->id           = '编号';
+$lang->program->name         = '项目集名称';
+$lang->program->desc         = '项目集描述';
+$lang->program->status       = '状态';
+$lang->program->PM           = '负责人';
+$lang->program->budget       = '预算';
+$lang->program->budgetUnit   = '预算单位';
+$lang->program->parent       = '父项目集';
+$lang->program->begin        = '计划开始';
+$lang->program->end          = '计划完成';
+$lang->program->stage        = '阶段';
+$lang->program->type         = '类型';
+$lang->program->pri          = '优先级';
+$lang->program->openedBy     = '由谁创建';
+$lang->program->openedDate   = '创建日期';
+$lang->program->closedBy     = '由谁关闭';
+$lang->program->closedDate   = '关闭日期';
+$lang->program->canceledBy   = '由谁取消';
+$lang->program->canceledDate = '取消日期';
+$lang->program->team         = '团队';
+$lang->program->order        = '排序';
+$lang->program->days         = '可用工作日';
+$lang->program->acl          = '访问控制';
+$lang->program->whitelist    = '白名单';
+$lang->program->deleted      = '已删除';
 
 /* Actions. */
 $lang->program->common                  = '项目集';
@@ -23,6 +33,8 @@ $lang->program->create                  = '添加项目集';
 $lang->program->createGuide             = '选择项目模板';
 $lang->program->edit                    = '编辑项目集';
 $lang->program->browse                  = '项目集列表';
+$lang->program->view                    = '项目集详情';
+$lang->program->copy                    = '复制项目集';
 $lang->program->product                 = '产品列表';
 $lang->program->project                 = '项目集项目列表';
 $lang->program->all                     = '所有项目集';
@@ -38,32 +50,40 @@ $lang->program->createStakeholder       = '添加干系人';
 $lang->program->unlinkStakeholder       = '移除干系人';
 $lang->program->batchUnlinkStakeholders = '批量移除干系人';
 $lang->program->unlink                  = '移除';
-$lang->program->moreProgram             = '更多项目集';
-$lang->program->confirmBatchUnlink      = "您确定要批量移除这些干系人吗？";
-$lang->program->stakeholderType         = '干系人类型';
-$lang->program->isStakeholderKey        = '关键干系人';
 $lang->program->importStakeholder       = '从父项目集导入';
 $lang->program->unbindWhitelist         = '移除白名单';
 $lang->program->importStakeholder       = '从父项目集导入';
 $lang->program->manageMembers           = '项目集团队';
-$lang->program->beyondParentBudget      = '已超出所属项目集的剩余预算';
-$lang->program->parentBudget            = '所属项目集剩余预算：';
-$lang->program->beginLetterParent       = "父项目集的开始日期：%s，开始日期不能小于父项目集的开始日期";
-$lang->program->endGreaterParent        = "父项目集的完成日期：%s，完成日期不能大于父项目集的完成日期";
-$lang->program->beginGreateChild        = "子项目集的最小开始日期：%s，父项目集的开始日期不能大于子项目集的最小开始日期";
-$lang->program->endLetterChild          = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
-$lang->program->closeErrorMessage       = '存在子项目集或项目为未关闭状态';
-$lang->program->hasChildren             = '该项目集有子项目集或项目存在，不能删除。';
-$lang->program->confirmDelete           = "您确定要删除吗？";
-$lang->program->readjustTime            = '重新调整项目集起止时间';
-$lang->program->accessDenied            = '你无权访问该项目集';
+
+$lang->program->template         = '项目集模板';
+$lang->program->category         = '项目集类型';
+$lang->program->progress         = '项目进度';
+$lang->program->children         = '子项目集';
+$lang->program->allInput         = '项目集总投入';
+$lang->program->teamCount        = '总人数';
+$lang->program->longTime         = '长期';
+$lang->program->moreProgram      = '更多项目集';
+$lang->program->stakeholderType  = '干系人类型';
+$lang->program->parentBudget     = '所属项目集剩余预算：';
+$lang->program->isStakeholderKey = '关键干系人';
 
 $lang->program->stakeholderTypeList['inside']  = '内部';
 $lang->program->stakeholderTypeList['outside'] = '外部';
 
-$lang->program->noProgram  = '暂时没有项目集';
-$lang->program->showClosed = '显示已关闭';
-$lang->program->tips       = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
+$lang->program->noProgram          = '暂时没有项目集';
+$lang->program->showClosed         = '显示已关闭';
+$lang->program->tips               = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
+$lang->program->confirmBatchUnlink = "您确定要批量移除这些干系人吗？";
+$lang->program->beginLetterParent  = "父项目集的开始日期：%s，开始日期不能小于父项目集的开始日期";
+$lang->program->endGreaterParent   = "父项目集的完成日期：%s，完成日期不能大于父项目集的完成日期";
+$lang->program->beginGreateChild   = "子项目集的最小开始日期：%s，父项目集的开始日期不能大于子项目集的最小开始日期";
+$lang->program->endLetterChild     = "子项目的最大完成日期：%s，父项目的完成日期不能小于子项目的最大完成日期";
+$lang->program->closeErrorMessage  = '存在子项目集或项目为未关闭状态';
+$lang->program->hasChildren        = '该项目集有子项目集或项目存在，不能删除。';
+$lang->program->confirmDelete      = "您确定要删除吗？";
+$lang->program->readjustTime       = '重新调整项目集起止时间';
+$lang->program->accessDenied       = '你无权访问该项目集';
+$lang->program->beyondParentBudget = '已超出所属项目集的剩余预算';
 
 $lang->program->endList[31]  = '一个月';
 $lang->program->endList[93]  = '三个月';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index a344671d89..b1556b77a2 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -53,7 +53,9 @@ $lang->project->testreport        = '测试报告';
 
 /* Fields. */
 $lang->project->common             = '项目';
+$lang->project->id                 = '项目编号';
 $lang->project->stage              = '阶段';
+$lang->project->model              = '项目管理方式';
 $lang->project->PM                 = '负责人';
 $lang->project->name               = '项目名称';
 $lang->project->category           = '项目类型';
@@ -63,7 +65,19 @@ $lang->project->copy               = '复制项目';
 $lang->project->begin              = '计划开始';
 $lang->project->end                = '计划完成';
 $lang->project->status             = '状态';
+$lang->project->subStatus          = '子状态';
+$lang->project->type               = '项目类型';
+$lang->project->pri                = '优先级';
+$lang->project->openedBy           = '由谁创建';
+$lang->project->openedDate         = '创建日期';
+$lang->project->closedBy           = '由谁关闭';
+$lang->project->closedDate         = '关闭日期';
+$lang->project->canceledBy         = '由谁取消';
+$lang->project->canceledDate       = '取消日期';
+$lang->project->team               = '团队';
+$lang->project->order              = '排序';
 $lang->project->budget             = '预算';
+$lang->project->budgetUnit         = '预算单位';
 $lang->project->template           = '项目模板';
 $lang->project->estimate           = '预计';
 $lang->project->consume            = '消耗';
diff --git a/module/user/model.php b/module/user/model.php
index 51ed604609..f6197b5949 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1115,7 +1115,7 @@ class userModel extends model
                 if($project->project)
                 {
                     $parentProject = zget($projectList, $project->project, '');
-                    if(empty($parentProject)) $parentProject = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->eq($project->project)->exec();
+                    if(empty($parentProject)) $parentProject = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch();
                     $project->projectName = $parentProject ? $parentProject->name : '';
                 }
                 $myProjects[$project->id] = $project;
@@ -1887,7 +1887,7 @@ class userModel extends model
             {
                 $stakeholders = zget($stakeholderGroup, $program->id, array());
                 $whiteList    = zget($whiteListGroup, $program->id, array());
-                if($program->acl == 'program') 
+                if($program->acl == 'program')
                 {
                     $stakeholders += zget($parentStakeholderGroup, $program->id, array());
                     $stakeholders += zget($parentPMGroup, $program->id, array());
@@ -1911,7 +1911,7 @@ class userModel extends model
             {
                 $stakeholders = zget($stakeholderGroup, $program->id, array());
                 $whiteList    = zget($whiteListGroup, $program->id, array());
-                if($program->acl == 'program') 
+                if($program->acl == 'program')
                 {
                     $stakeholders += zget($parentStakeholderGroup, $program->id, array());
                     $stakeholders += zget($parentPMGroup, $program->id, array());