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
e3deaf5a
authored
Apr 29, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
66ded61e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
app/Http/Controllers/Filter/SupplierFilter.php
app/Http/Controllers/Filter/SupplierFilter.php
View file @
e3deaf5a
...
@@ -50,7 +50,7 @@ class SupplierFilter
...
@@ -50,7 +50,7 @@ class SupplierFilter
if
(
!
empty
(
$map
[
'status'
]))
{
if
(
!
empty
(
$map
[
'status'
]))
{
$query
->
where
(
'status'
,
$map
[
'status'
]);
$query
->
where
(
'status'
,
$map
[
'status'
]);
}
}
if
(
!
empty
(
$map
[
'is_type'
])
)
{
if
(
isset
(
$map
[
'is_type'
])
&&
$map
[
'is_type'
]
==
"0"
)
{
$query
->
where
(
'is_type'
,
$map
[
'is_type'
]);
$query
->
where
(
'is_type'
,
$map
[
'is_type'
]);
}
}
if
(
!
empty
(
$map
[
'has_sku'
]))
{
if
(
!
empty
(
$map
[
'has_sku'
]))
{
...
@@ -120,7 +120,7 @@ class SupplierFilter
...
@@ -120,7 +120,7 @@ class SupplierFilter
$inUserIdSql
=
"("
.
$inUserIdSql
.
")"
;
$inUserIdSql
=
"("
.
$inUserIdSql
.
")"
;
if
(
$subordinateCodeIds
)
{
if
(
$subordinateCodeIds
)
{
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or purchase_uid in
$inCodeIdSql
or channel_uid REGEXP '
$likeSqlRaw
' or is_type = 1) "
));
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or purchase_uid in
$inCodeIdSql
or channel_uid REGEXP '
$likeSqlRaw
' or is_type = 1) "
));
}
else
{
}
else
{
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or is_type = 1)"
));
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid in
$inUserIdSql
or is_type = 1)"
));
}
}
...
@@ -128,7 +128,7 @@ class SupplierFilter
...
@@ -128,7 +128,7 @@ class SupplierFilter
if
(
$codeId
)
{
if
(
$codeId
)
{
//剩下的就只是看自己相关的
//剩下的就只是看自己相关的
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid =
$userId
or purchase_uid =
$codeId
or channel_uid like '%${codeId}%') "
));
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid =
$userId
or purchase_uid =
$codeId
or channel_uid like '%${codeId}%') "
));
}
else
{
}
else
{
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid =
$userId
)"
));
$query
->
whereRaw
(
DB
::
raw
(
"(create_uid =
$userId
)"
));
}
}
...
...
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