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

@@ -35,6 +35,7 @@ class BTemplateLogController extends BaseController
     public function lists(BTemplateLog $bTemplateLog){
     public function lists(BTemplateLog $bTemplateLog){
 //        unset($this->map['template_id']);
 //        unset($this->map['template_id']);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
+        $this->map['source'] = 1;
         $this->map['is_custom'] = 0;
         $this->map['is_custom'] = 0;
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){

@@ -127,7 +127,7 @@ class CustomTemplateController extends BaseController
         ]);
         ]);
         $this->map['source'] = 9;
         $this->map['source'] = 9;
         $this->map['is_custom'] = 0;
         $this->map['is_custom'] = 0;
-        $lists = $bTemplateLog->list($this->map,'id',['id','template_id','operator_id','source','created_at','updated_at']);
+        $lists = $bTemplateLog->list($this->map,'id',['id','template_id','operator_id','source','created_at','updated_at'],'desc',10);
         if(!empty($lists)){
         if(!empty($lists)){
             $templateModel = new Template();
             $templateModel = new Template();
             $userModel = new User();
             $userModel = new User();