From b5e6701084f6ae937f428291940da170ba4042c3 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Fri, 13 Sep 2019 09:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=97=B6=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=97=AE=E9=A2=98=20#23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 .../project/controller/ProjectTemplate.php       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/project/controller/ProjectTemplate.php b/application/project/controller/ProjectTemplate.php
index bacd27c..ac779c8 100644
--- a/application/project/controller/ProjectTemplate.php
+++ b/application/project/controller/ProjectTemplate.php
@@ -2,6 +2,7 @@
 
 namespace app\project\controller;
 
+use app\common\Model\CommonModel;
 use app\common\Model\Member;
 use app\common\Model\MemberAccount;
 use app\common\Model\Notify;
@@ -37,17 +38,22 @@ class ProjectTemplate extends BasicApi
      */
     public function index()
     {
+        $prefix = config('database.prefix');
+        $page = Request::param('page', 1);
+        $pageSize = Request::param('pageSize', cookie('pageSize'));
         $orgCode = getCurrentOrganizationCode();
-        $where = [];
+        $sql = '';
         $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) {
-            $where[] = ['is_system', '=', $viewType];
+            $sql = "select * from {$prefix}project_template as pt where pt.is_system = 1";
         }
         if ($viewType == 0) {
-            $where[] = ['organization_code', '=', $orgCode];
-            $where[] = ['is_system', '=', 0];
+            $sql = "select * from {$prefix}project_template as pt where pt.organization_code = '{$orgCode}' and pt.is_system = 0";
         }
-        $list = $this->model->_list($where);
+        $list = CommonModel::limitByQuery($sql, $page, $pageSize);
         if ($list['list']) {
             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();