mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复创建项目时无法获取公共模板的问题 #23

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-09-13 09:11:30 +08:00
parent d79706481a
commit b5e6701084
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/project/controller/ProjectTemplate.php
View File

@ -2,6 +2,7 @@
namespace app\project\controller; namespace app\project\controller;
use app\common\Model\CommonModel;
use app\common\Model\Member; use app\common\Model\Member;
use app\common\Model\MemberAccount; use app\common\Model\MemberAccount;
use app\common\Model\Notify; use app\common\Model\Notify;
@ -37,17 +38,22 @@ class ProjectTemplate extends BasicApi
*/ */
public function index() public function index()
{ {
$prefix = config('database.prefix');
$page = Request::param('page', 1);
$pageSize = Request::param('pageSize', cookie('pageSize'));
$orgCode = getCurrentOrganizationCode(); $orgCode = getCurrentOrganizationCode();
$where = []; $sql = '';
$viewType = Request::post('viewType', -1); $viewType = Request::post('viewType', -1);
if ($viewType == -1) {
$sql = "select * from {$prefix}project_template as pt where pt.organization_code = '{$orgCode}' or pt.is_system = 1";
}
if ($viewType == 1) { if ($viewType == 1) {
$where[] = ['is_system', '=', $viewType]; $sql = "select * from {$prefix}project_template as pt where pt.is_system = 1";
} }
if ($viewType == 0) { if ($viewType == 0) {
$where[] = ['organization_code', '=', $orgCode]; $sql = "select * from {$prefix}project_template as pt where pt.organization_code = '{$orgCode}' and pt.is_system = 0";
$where[] = ['is_system', '=', 0];
} }
$list = $this->model->_list($where); $list = CommonModel::limitByQuery($sql, $page, $pageSize);
if ($list['list']) { if ($list['list']) {
foreach ($list['list'] as &$item) { foreach ($list['list'] as &$item) {
$item['task_stages'] = \app\common\Model\TaskStagesTemplate::where(['project_template_code' => $item['code']])->field('name')->order('sort desc,id asc')->select(); $item['task_stages'] = \app\common\Model\TaskStagesTemplate::where(['project_template_code' => $item['code']])->field('name')->order('sort desc,id asc')->select();