合并分支 'master-server' 到 'master'

gx数据



查看合并请求 !835

@@ -150,9 +150,6 @@ class ComController extends BaseController
         if($uploadCode != 1){
         if($uploadCode != 1){
             $data[] = 41;
             $data[] = 41;
         }
         }
-        if(!empty($data)){
-            $this->map['id'] = ['not in',$data];
-        }
         $projectCode = $this->getProjectWatermark();
         $projectCode = $this->getProjectWatermark();
         if($projectCode != 1){
         if($projectCode != 1){
             $data[] = 50;
             $data[] = 50;