From a8c27a1513eb030956df7c8eae236f03b2a6f2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 23 Oct 2017 13:19:06 +0800
Subject: [PATCH] * fix task model empty

---
 module/score/config.php           |  7 +++++++
 module/score/control.php          |  7 +++++++
 module/score/lang/en.php          |  7 +++++++
 module/score/lang/zh-cn.php       |  7 +++++++
 module/score/lang/zh-tw.php       |  7 +++++++
 module/score/model.php            |  7 +++++++
 module/score/view/browse.html.php |  7 +++++++
 module/task/model.php             | 11 +++++++----
 8 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 module/score/config.php
 create mode 100644 module/score/control.php
 create mode 100644 module/score/lang/en.php
 create mode 100644 module/score/lang/zh-cn.php
 create mode 100644 module/score/lang/zh-tw.php
 create mode 100644 module/score/model.php
 create mode 100644 module/score/view/browse.html.php

diff --git a/module/score/config.php b/module/score/config.php
new file mode 100644
index 0000000000..07ccd10925
--- /dev/null
+++ b/module/score/config.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午10:33
+ */
\ No newline at end of file
diff --git a/module/score/control.php b/module/score/control.php
new file mode 100644
index 0000000000..07ccd10925
--- /dev/null
+++ b/module/score/control.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午10:33
+ */
\ No newline at end of file
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
new file mode 100644
index 0000000000..98a756efe6
--- /dev/null
+++ b/module/score/lang/en.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午11:51
+ */
\ No newline at end of file
diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php
new file mode 100644
index 0000000000..541c6749f1
--- /dev/null
+++ b/module/score/lang/zh-cn.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午10:57
+ */
\ No newline at end of file
diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php
new file mode 100644
index 0000000000..98a756efe6
--- /dev/null
+++ b/module/score/lang/zh-tw.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午11:51
+ */
\ No newline at end of file
diff --git a/module/score/model.php b/module/score/model.php
new file mode 100644
index 0000000000..483521e74b
--- /dev/null
+++ b/module/score/model.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午10:32
+ */
\ No newline at end of file
diff --git a/module/score/view/browse.html.php b/module/score/view/browse.html.php
new file mode 100644
index 0000000000..1bfc4b1e6e
--- /dev/null
+++ b/module/score/view/browse.html.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lvtao
+ * Date: 2017/10/23
+ * Time: 上午10:44
+ */
\ No newline at end of file
diff --git a/module/task/model.php b/module/task/model.php
index 6f69dce32d..2e8c6c0355 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1081,10 +1081,13 @@ class taskModel extends model
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', ($productID or $type == 'needconfirm') ? false : true);
 
         $taskList = array_keys($tasks);
-        $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->in($taskList)->orderBy('id_desc')->fetchGroup('parent');
-        if(!empty($children)) foreach($children as $key => $child) $tasks[$key]->children = $child;
-        $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
-        if($teams) foreach($teams as $key => $team) if(!empty($team)) $tasks[$key]->team = $team;
+        if(!empty($taskList))
+        {
+            $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->in($taskList)->orderBy('id_desc')->fetchGroup('parent');
+            if(!empty($children)) foreach($children as $key => $child) $tasks[$key]->children = $child;
+            $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
+            if($teams) foreach($teams as $key => $team) if(!empty($team)) $tasks[$key]->team = $team;
+        }
 
         if($tasks) return $this->processTasks($tasks);
         return array();