合并分支 'lyh-server' 到 'master'
变更数据 查看合并请求 !3219
正在显示
1 个修改的文件
包含
6 行增加
和
4 行删除
| @@ -148,10 +148,12 @@ class TicketUploadDataController extends BaseController | @@ -148,10 +148,12 @@ class TicketUploadDataController extends BaseController | ||
| 148 | if($info === false){ | 148 | if($info === false){ |
| 149 | $this->response('当前数据不存在或已被删除',Code::SYSTEM_ERROR); | 149 | $this->response('当前数据不存在或已被删除',Code::SYSTEM_ERROR); |
| 150 | } | 150 | } |
| 151 | - ProjectServer::useProject($info['project_id']); | ||
| 152 | - $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],$info['text']['keyword_id'] ?? [],true); | ||
| 153 | - $info = $this->getHandleFileImage($info); | ||
| 154 | - DB::disconnect('custom_mysql'); | 151 | + if($info['project_type'] == $this->model::TYPE_SIX){ |
| 152 | + ProjectServer::useProject($info['project_id']); | ||
| 153 | + $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],$info['text']['keyword_id'] ?? [],true); | ||
| 154 | + $info = $this->getHandleFileImage($info); | ||
| 155 | + DB::disconnect('custom_mysql'); | ||
| 156 | + } | ||
| 155 | $this->response('success', Code::SUCCESS, $info); | 157 | $this->response('success', Code::SUCCESS, $info); |
| 156 | } | 158 | } |
| 157 | 159 |
-
请 注册 或 登录 后发表评论