diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php
index eeca668075..d2cefafda6 100644
--- a/lib/base/dao/dao.class.php
+++ b/lib/base/dao/dao.class.php
@@ -1067,9 +1067,11 @@ class baseDAO
         {
             $table = strtolower($this->table);
         }
-        $fieldLabel   = isset($lang->$table->$fieldName)       ? $lang->$table->$fieldName       : $fieldName;
-        $selectFields = isset($config->$table->selectFields)   ? $config->$table->selectFields   : '';
-        $value        = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
+        $fieldLabel = isset($lang->$table->$fieldName)       ? $lang->$table->$fieldName       : $fieldName;
+        $value      = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
+
+        $moduleName   = $table == 'case' ? 'testcase' : $table;
+        $selectFields = isset($config->$moduleName->selectFields) ? $config->$moduleName->selectFields : '';
 
         /* 
          * 检查唯一性。
diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php
index b797a0cd0d..ef1a034cb0 100644
--- a/lib/base/filter/filter.class.php
+++ b/lib/base/filter/filter.class.php
@@ -331,8 +331,9 @@ class baseValidater
      */
     public static function checkNotEmpty($var, $fieldName = '')
     {
+        $var = trim($var);
         if($fieldName) return !empty($var);
-        return strlen(trim($var)) != 0;
+        return strlen($var) != 0;
     }
 
     /**