处理数据权限筛选时，不覆盖原有的搜索字段promote_id

Application/Admin/Common/extend.php

@@ -1611,7 +1611,15 @@ function setPowerPromoteIds(&$map, $column = 'promote_id') {
     if (empty($promoteIds)) {
         $map[$column] = -1;
     } elseif ($promoteIds != 'all') {
-        $map[$column] = array('in', $promoteIds);
+        if (isset($map[$column])) {
+            if (isset($map['_string'])) {//查询字段中已存在promote_id，不覆盖此条件而处理
+                $map['_string'] .= " and $column in($promoteIds)";
+            } else {
+                $map['_string'] = " $column in($promoteIds)";
+            }
+        } else {
+            $map[$column] = array('in', $promoteIds);
+        }
     }
 }