From 015af00fcd711e0023dbf543182aea398c9531de Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 13 Nov 2020 10:25:31 +0800
Subject: [PATCH] * Adjust code.

---
 module/product/model.php | 1 +
 module/program/model.php | 8 ++++----
 module/project/model.php | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index 9fab1dfb51..e34e631cc5 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -310,6 +310,7 @@ class productModel extends model
      * Get products by project.
      *
      * @param  int    $projectID
+     * @param  int    $status   all|noclosed
      * @access public
      * @return array
      */
diff --git a/module/program/model.php b/module/program/model.php
index f4bfbb6c95..f13de27fc0 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -282,8 +282,8 @@ class programModel extends model
         $this->dao->insert(TABLE_PROGRAM)->data($program)
             ->autoCheck()
             ->batchcheck($this->config->program->PGMCreate->requiredFields, 'notempty')
-            ->check('name', 'unique', "deleted='0'")
-            ->check('code', 'unique', "deleted='0'")
+            ->checkIF(!empty($program->name), 'name', 'unique')
+            ->checkIF(!empty($program->name), 'code', 'unique')
             ->exec();
 
         if(!dao::isError())
@@ -1148,8 +1148,8 @@ class programModel extends model
         $this->dao->insert(TABLE_PROJECT)->data($project)
             ->autoCheck()
             ->batchcheck($requiredFields, 'notempty')
-            ->check('name', 'unique', "deleted='0'")
-            ->check('code', 'unique', "deleted='0'")
+            ->checkIF(!empty($project->name), 'name', 'unique')
+            ->checkIF(!empty($project->name), 'code', 'unique')
             ->exec();
 
         /* Add the creater to the team. */
diff --git a/module/project/model.php b/module/project/model.php
index c6f95ba676..95950c396a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -336,7 +336,7 @@ class projectModel extends model
             ->checkIF($sprint->begin != '', 'begin', 'date')
             ->checkIF($sprint->end != '', 'end', 'date')
             ->checkIF($sprint->end != '', 'end', 'gt', $sprint->begin)
-            ->check('code', 'unique', "deleted='0'")
+            ->checkIF(!empty($sprint->code), 'code', 'unique')
             ->exec();
 
         /* Add the creater to the team. */
@@ -864,7 +864,7 @@ class projectModel extends model
      * Get project id by program.
      *
      * @param  int  $programID
-     * @param  int  $status
+     * @param  int  $status    all|undone|wait|doing|suspended|closed
      * @access public
      * @return array
      */