Commit b220205c b220205c8b0e3e023f2728e834b49c5c73f987a5 by lemon

*

1 parent 9eca8e26
......@@ -4,6 +4,7 @@ namespace App\Models\Legal;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Contract
......@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/
class Contract extends BaseModel
{
use HasFactory;
use HasFactory,SoftDeletes;
/**
* The attributes that should be cast to native types.
......
......@@ -4,6 +4,7 @@ namespace App\Models\Legal;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Song
......@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/
class Song extends BaseModel
{
use HasFactory;
use HasFactory,SoftDeletes;
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
......
......@@ -4,6 +4,7 @@ namespace App\Models\Legal;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class SongsIp
......@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/
class SongsIp extends BaseModel
{
use HasFactory;
use HasFactory,SoftDeletes;
/**
* @var string
......
......@@ -4,6 +4,7 @@ namespace App\Models\Legal;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Stakeholder
......@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/
class Stakeholder extends BaseModel
{
use HasFactory;
use HasFactory,SoftDeletes;
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
......
......@@ -4,6 +4,7 @@ namespace App\Models\Legal;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Treaty
......@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/
class Treaty extends BaseModel
{
use HasFactory;
use HasFactory,SoftDeletes;
/**
* @var string
......
......@@ -30,7 +30,6 @@ class MusicianSongService extends Service
$song_table = Song::table();
$songip_table = SongsIp::table();
$res = Song::query()->join($songip_table, "{$song_table}.id", '=', "{$songip_table}.song_id")
->with(['contractDetail', 'cover'])->whereIn("{$songip_table}.song_id", $song_ids)->select(["{$song_table}.id", 'publish_song'])
->groupBy(["song_id"])->paginate($this->pageSize);
......