Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -26,6 +26,7 @@ class BTemplateModuleController extends BaseController
     public function lists(BTemplateModuleLogic $bTemplateModuleLogic,BTemplateModuleProjectLogic $bTemplateModuleProjectLogic){
     public function lists(BTemplateModuleLogic $bTemplateModuleLogic,BTemplateModuleProjectLogic $bTemplateModuleProjectLogic){
         if(!isset($this->map['test_model'])){
         if(!isset($this->map['test_model'])){
             $this->map['test_model'] = ['in',[0,1]];
             $this->map['test_model'] = ['in',[0,1]];
+            $this->map['project_id'] = 0;
         }
         }
         $data = [];
         $data = [];
         $list = $bTemplateModuleLogic->ModuleList($this->map,$this->order);
         $list = $bTemplateModuleLogic->ModuleList($this->map,$this->order);