Merge branch release/21.7.6 of zentao/zentaopms (#11931)

lib/base/dao/dao.class.php

@@ -2825,6 +2825,8 @@ class baseSQL
      */
     public function notin($ids)
     {
+        if($this->inCondition and !$this->conditionIsTrue) return $this;
+
         if((is_string($ids) && $ids === '') || (is_array($ids) && empty($ids)))
         {
            $pattern = '/\s+(?:`([^`]+)`|"([^"]+)"|(\w+))\s*$/i';
@@ -2834,8 +2836,6 @@ class baseSQL
            return $this;
         }
 
-        if($this->inCondition and !$this->conditionIsTrue) return $this;
-
         $dbIN = helper::dbIN($ids);
         if(strpos($dbIN, '=') === 0) $this->sql .= ' !' . $dbIN;
         else $this->sql .= ' NOT ' . helper::dbIN($ids);