作者 lyh

gx

@@ -34,13 +34,14 @@ class BTemplateLogController extends BaseController @@ -34,13 +34,14 @@ class BTemplateLogController extends BaseController
34 */ 34 */
35 public function lists(BTemplateLog $bTemplateLog){ 35 public function lists(BTemplateLog $bTemplateLog){
36 $this->map['project_id'] = $this->user['project_id']; 36 $this->map['project_id'] = $this->user['project_id'];
  37 + $this->map['source'] = 1;
37 $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']); 38 $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
38 if(!empty($lists['list'])){ 39 if(!empty($lists['list'])){
39 $templateModel = new Template(); 40 $templateModel = new Template();
40 $userModel = new User(); 41 $userModel = new User();
41 foreach ($lists['list'] as $k => $v){ 42 foreach ($lists['list'] as $k => $v){
42 $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name']; 43 $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
43 - $v['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name']; 44 + $v['operator_name'] = $userModel->getName($v['operator_id']);
44 $lists['list'][$k] = $v; 45 $lists['list'][$k] = $v;
45 } 46 }
46 } 47 }