合并分支 'lyh-server' 到 'master'
gx 查看合并请求 !2555
正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
| @@ -80,7 +80,7 @@ class TicketLogic extends BaseLogic | @@ -80,7 +80,7 @@ class TicketLogic extends BaseLogic | ||
| 80 | $ticketLogModel = new TicketLog(); | 80 | $ticketLogModel = new TicketLog(); |
| 81 | $manageModel = new ManageHr(); | 81 | $manageModel = new ManageHr(); |
| 82 | foreach ($ticketsList as $key => $item){ | 82 | foreach ($ticketsList as $key => $item){ |
| 83 | - $item['project_name'] = $projectModel->getValue(['id'=>$item['project_id']],'name'); | 83 | + $item['project_name'] = $projectModel->getValue(['id'=>$item['project_id']],'title'); |
| 84 | $engineer_id = $ticketLogModel->getValue(['ticket_id'=>$item['id'],'is_engineer'=>1],'engineer_id'); | 84 | $engineer_id = $ticketLogModel->getValue(['ticket_id'=>$item['id'],'is_engineer'=>1],'engineer_id'); |
| 85 | if(!empty($engineer_id)){ | 85 | if(!empty($engineer_id)){ |
| 86 | $item['manage_name'] = $manageModel->getValue(['manage_id'=>$engineer_id],'name'); | 86 | $item['manage_name'] = $manageModel->getValue(['manage_id'=>$engineer_id],'name'); |
-
请 注册 或 登录 后发表评论