diff --git a/module/setting/model.php b/module/setting/model.php
index 72e55e0482..064c6f4aa2 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -77,8 +77,7 @@ class settingModel extends model
         $item->section = $section;
         $item->key     = $key;
         $item->value   = $value;
-
-        if($vision) $item->vision = $vision;
+        $item->vision  = empty($vision) ? '' : $vision;
 
         $this->dao->replace(TABLE_CONFIG)->data($item)->exec();
     }
@@ -164,6 +163,12 @@ class settingModel extends model
      */
     public function createDAO($params, $method = 'select')
     {
+        $params['vision']  = isset($params['vision'])  ? $params['vision']  : '';
+        $params['owner']   = isset($params['owner'])   ? $params['owner']   : '';
+        $params['module']  = isset($params['module'])  ? $params['module']  : '';
+        $params['section'] = isset($params['section']) ? $params['section'] : '';
+        $params['key']     = isset($params['key'])     ? $params['key']     : '';
+
         return $this->dao->$method('*')->from(TABLE_CONFIG)->where('1 = 1')
             ->beginIF($params['vision'])->andWhere('vision')->in($params['vision'])->fi()
             ->beginIF($params['owner'])->andWhere('owner')->in($params['owner'])->fi()
diff --git a/test/class/setting.class.php b/test/class/setting.class.php
new file mode 100644
index 0000000000..7c6639ea28
--- /dev/null
+++ b/test/class/setting.class.php
@@ -0,0 +1,126 @@
+<?php
+class settingTest
+{
+    public function __construct()
+    {
+         global $tester;
+         $this->objectModel = $tester->loadModel('setting');
+    }
+
+    public function getItemTest($paramString)
+    {
+        $objects = $this->objectModel->getItem($paramString);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function getItemsTest($paramString)
+    {
+        $objects = $this->objectModel->getItems($paramString);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function setItemTest($path, $value = '')
+    {
+        $objects = $this->objectModel->setItem($path, $value = '');
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function setItemsTest($path, $items)
+    {
+        $objects = $this->objectModel->setItems($path, $items);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function deleteItemsTest($paramString)
+    {
+        $objects = $this->objectModel->deleteItems($paramString);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function parseItemParamTest($paramString)
+    {
+        $objects = $this->objectModel->parseItemParam($paramString);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function createDAOTest($params, $method = 'select')
+    {
+        $objects = $this->objectModel->createDAO($params, $method = 'select');
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function getSysAndPersonalConfigTest($account = '')
+    {
+        $objects = $this->objectModel->getSysAndPersonalConfig($account = '');
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function getVersionTest()
+    {
+        $objects = $this->objectModel->getVersion();
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function getURSRTest()
+    {
+        $objects = $this->objectModel->getURSR();
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function updateVersionTest($version)
+    {
+        $objects = $this->objectModel->updateVersion($version);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function setSNTest()
+    {
+        $objects = $this->objectModel->setSN();
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    public function snNeededUpdateTest($sn)
+    {
+        $objects = $this->objectModel->snNeededUpdate($sn);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+}
diff --git a/test/model/setting/createdao.php b/test/model/setting/createdao.php
new file mode 100644
index 0000000000..1e5b299bb8
--- /dev/null
+++ b/test/model/setting/createdao.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->createDAO();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->createDAOTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/deleteitems.php b/test/model/setting/deleteitems.php
new file mode 100644
index 0000000000..f4e098ab30
--- /dev/null
+++ b/test/model/setting/deleteitems.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->deleteItems();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->deleteItemsTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/getitem.php b/test/model/setting/getitem.php
new file mode 100644
index 0000000000..5f225edb7e
--- /dev/null
+++ b/test/model/setting/getitem.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->getItem();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->getItemTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/getitems.php b/test/model/setting/getitems.php
new file mode 100644
index 0000000000..26a599d319
--- /dev/null
+++ b/test/model/setting/getitems.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->getItems();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->getItemsTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/getsysandpersonalconfig.php b/test/model/setting/getsysandpersonalconfig.php
new file mode 100644
index 0000000000..8342b1ed77
--- /dev/null
+++ b/test/model/setting/getsysandpersonalconfig.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->getSysAndPersonalConfig();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->getSysAndPersonalConfigTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/getursr.php b/test/model/setting/getursr.php
new file mode 100644
index 0000000000..6a0239cf07
--- /dev/null
+++ b/test/model/setting/getursr.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->getURSR();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->getURSRTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/getversion.php b/test/model/setting/getversion.php
new file mode 100644
index 0000000000..8c9a982342
--- /dev/null
+++ b/test/model/setting/getversion.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->getVersion();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->getVersionTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/parseitemparam.php b/test/model/setting/parseitemparam.php
new file mode 100644
index 0000000000..a121884eb0
--- /dev/null
+++ b/test/model/setting/parseitemparam.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->parseItemParam();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->parseItemParamTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/setitem.php b/test/model/setting/setitem.php
new file mode 100644
index 0000000000..698edea9f0
--- /dev/null
+++ b/test/model/setting/setitem.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->setItem();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->setItemTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/setitems.php b/test/model/setting/setitems.php
new file mode 100644
index 0000000000..90161bb8d3
--- /dev/null
+++ b/test/model/setting/setitems.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->setItems();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->setItemsTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/setsn.php b/test/model/setting/setsn.php
new file mode 100644
index 0000000000..2d8092362f
--- /dev/null
+++ b/test/model/setting/setsn.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->setSN();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->setSNTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/snneededupdate.php b/test/model/setting/snneededupdate.php
new file mode 100644
index 0000000000..c1c0b73aa0
--- /dev/null
+++ b/test/model/setting/snneededupdate.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->snNeededUpdate();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->snNeededUpdateTest()) && p() && e();
\ No newline at end of file
diff --git a/test/model/setting/updateversion.php b/test/model/setting/updateversion.php
new file mode 100644
index 0000000000..150d77e580
--- /dev/null
+++ b/test/model/setting/updateversion.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/setting.class.php';
+su('admin');
+
+/**
+
+title=测试 settingModel->updateVersion();
+cid=1
+pid=1
+
+*/
+
+$setting = new settingTest();
+
+r($setting->updateVersionTest()) && p() && e();
\ No newline at end of file
diff --git a/test/ztest b/test/ztest
index 61374a132c..5038673164 100755
--- a/test/ztest
+++ b/test/ztest
@@ -88,6 +88,9 @@ switch($argv[1])
     case 'report':
         ztfRun('model/report');
         break;
+    case 'setting':
+        ztfRun('model/setting');
+        break;
     case 'stage':
         ztfRun('model/stage');
         break;