|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace App\Modules\Book\Models;
|
|
namespace App\Modules\Book\Models;
|
|
|
|
|
|
|
|
+use App\Modules\Book\Services\BookRoleService;
|
|
use App\Modules\Book\Services\BookTagsService;
|
|
use App\Modules\Book\Services\BookTagsService;
|
|
use App\Modules\User\Services\ReadRecordService;
|
|
use App\Modules\User\Services\ReadRecordService;
|
|
use App\Modules\Book\Services\BookConfigService;
|
|
use App\Modules\Book\Services\BookConfigService;
|
|
@@ -70,7 +71,14 @@ class BookConfig extends Model
|
|
//关键词查询
|
|
//关键词查询
|
|
if ($key == 'key' && $v) {
|
|
if ($key == 'key' && $v) {
|
|
|
|
|
|
- $res = $res->where('book_configs.book_name', 'like', '%' . $v . '%');
|
|
|
|
|
|
+ //$res = $res->where('book_configs.book_name', 'like', '%' . $v . '%');
|
|
|
|
+ $res = $res->where(function ($query) use ($v) {
|
|
|
|
+ $query->where('book_configs.book_name', 'like', '%' . $v . '%');
|
|
|
|
+ $roles_bids = BookRoleService::getBidsByRole($v);
|
|
|
|
+ if(count($roles_bids)>0) {
|
|
|
|
+ $query->orWhereIn('book_configs',$roles_bids);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
//->orWhere('books.intro', 'like', '%' . $v . '%')
|
|
//->orWhere('books.intro', 'like', '%' . $v . '%')
|
|
//->orWhere('books.category_name', 'like', '%' . $v . '%')->orWhere('books.author', 'like', '%' . $v . '%')
|
|
//->orWhere('books.category_name', 'like', '%' . $v . '%')->orWhere('books.author', 'like', '%' . $v . '%')
|
|
//->orWhere('books.keyword', 'like', '%' . $v . '%');
|
|
//->orWhere('books.keyword', 'like', '%' . $v . '%');
|