合并分支 'workorder' 到 'master'
ok 查看合并请求 !2376
正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
| @@ -26,7 +26,7 @@ class TicketProject extends Base | @@ -26,7 +26,7 @@ class TicketProject extends Base | ||
| 26 | public function pm() | 26 | public function pm() |
| 27 | { | 27 | { |
| 28 | return $this->hasOne(ManageHr::class, 'manage_id', 'pm_id') | 28 | return $this->hasOne(ManageHr::class, 'manage_id', 'pm_id') |
| 29 | - ->where('pm_id', '>', 0) | 29 | +// ->where('pm_id', '>', 0) |
| 30 | ->select(['manage_id', 'name', 'nickname']); | 30 | ->select(['manage_id', 'name', 'nickname']); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| @@ -34,7 +34,7 @@ class TicketProject extends Base | @@ -34,7 +34,7 @@ class TicketProject extends Base | ||
| 34 | public function assm() | 34 | public function assm() |
| 35 | { | 35 | { |
| 36 | return $this->hasOne(ManageHr::class, 'manage_id', 'assm_id') | 36 | return $this->hasOne(ManageHr::class, 'manage_id', 'assm_id') |
| 37 | - ->where('assm_id', '>', 0) | 37 | +// ->where('assm_id', '>', 0) |
| 38 | ->select(['manage_id', 'name', 'nickname']); | 38 | ->select(['manage_id', 'name', 'nickname']); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| @@ -42,7 +42,7 @@ class TicketProject extends Base | @@ -42,7 +42,7 @@ class TicketProject extends Base | ||
| 42 | public function seom() | 42 | public function seom() |
| 43 | { | 43 | { |
| 44 | return $this->hasOne(ManageHr::class, 'manage_id', 'seom_id') | 44 | return $this->hasOne(ManageHr::class, 'manage_id', 'seom_id') |
| 45 | - ->where('seom_id', '>', 0) | 45 | +// ->where('seom_id', '>', 0) |
| 46 | ->select(['manage_id', 'name', 'nickname']); | 46 | ->select(['manage_id', 'name', 'nickname']); |
| 47 | } | 47 | } |
| 48 | 48 | ||
| @@ -52,7 +52,7 @@ class TicketProject extends Base | @@ -52,7 +52,7 @@ class TicketProject extends Base | ||
| 52 | public function first_engineer() | 52 | public function first_engineer() |
| 53 | { | 53 | { |
| 54 | return $this->hasOne(ManageHr::class, 'manage_id', 'engineer_id') | 54 | return $this->hasOne(ManageHr::class, 'manage_id', 'engineer_id') |
| 55 | - ->where('engineer_id', '>', 0) | 55 | +// ->where('engineer_id', '>', 0) |
| 56 | ->select(['manage_id', 'name', 'nickname']); | 56 | ->select(['manage_id', 'name', 'nickname']); |
| 57 | } | 57 | } |
| 58 | 58 |
-
请 注册 或 登录 后发表评论