From bc92db2f3f125d335dece378453c220e57b6398e Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 8 Sep 2020 13:26:54 +0800
Subject: [PATCH] * Adjust check project type.

---
 framework/router.class.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index bece0ed36d..6f64d7d511 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -150,15 +150,7 @@ class router extends baseRouter
             $productIndex = $storyIndex = $hourIndex = $planIndex = $URAndSR = 0;
             $projectIndex = empty($this->config->isINT) ? 0 : 1;
 
-            if($this->session->program)
-            {
-                $template = $this->dbh->query('SELECT template FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch();
-                if($template->template == 'waterfall')
-                {
-                    $projectIndex = 2;
-                    $planIndex    = 1;
-                }
-            }
+            if($this->session->program) $template = $this->dbh->query('SELECT template FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch();
 
             foreach($commonSettings as $setting)
             {
@@ -178,6 +170,12 @@ class router extends baseRouter
                 }
             }
 
+            if(isset($template->template) && $template->template == 'waterfall')
+            {
+                $projectIndex = 2;
+                $planIndex    = 1;
+            }
+
             $config->storyCommon = $storyIndex;
             $config->URAndSR     = $URAndSR;