Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
087c79cf
authored
Apr 28, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
aa314222
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
app/Http/Controllers/Api/SupplierContactApiController.php
app/Http/Controllers/Filter/SupplierFilter.php
app/Http/Controllers/Api/SupplierContactApiController.php
View file @
087c79cf
...
...
@@ -51,7 +51,11 @@ class SupplierContactApiController extends Controller
$inUserIdSql
=
implode
(
','
,
$subordinateUserIds
);
$inCodeIdSql
=
"("
.
$inCodeIdSql
.
")"
;
$inUserIdSql
=
"("
.
$inUserIdSql
.
")"
;
$query
->
whereRaw
(
DB
::
raw
(
"(admin_id in
$inUserIdSql
or can_check_uids in
$inCodeIdSql
)"
));
if
(
$inCodeIdSql
)
{
$query
->
whereRaw
(
DB
::
raw
(
"(admin_id in
$inUserIdSql
or can_check_uids in
$inCodeIdSql
)"
));
}
else
{
$query
->
whereRaw
(
DB
::
raw
(
"(admin_id in
$inUserIdSql
)"
));
}
}
else
{
$query
->
whereRaw
(
"(can_check_uids =
$codeId
or admin_id =
$adminId
)"
);
}
...
...
app/Http/Controllers/Filter/SupplierFilter.php
View file @
087c79cf
...
...
@@ -118,7 +118,11 @@ class SupplierFilter
$inUserIdSql
=
implode
(
','
,
$subordinateUserIds
);
$inCodeIdSql
=
"("
.
$inCodeIdSql
.
")"
;
$inUserIdSql
=
"("
.
$inUserIdSql
.
")"
;
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or purchase_uid in
$inCodeIdSql
or channel_uid REGEXP '
$likeSqlRaw
') "
));
if
(
$subordinateCodeIds
)
{
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or purchase_uid in
$inCodeIdSql
or channel_uid REGEXP '
$likeSqlRaw
') "
));
}
else
{
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
)"
));
}
}
else
{
if
(
$codeId
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment