Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
php_frq_api
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
9e74afb4
authored
Mar 27, 2021
by
hcy001
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'master' of
ssh://119.23.72.7:22611/q578953158/php_frq_api
parents
e704b3db
96095050
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
app/Model/QuoteModel.php
app/Model/QuoteModel.php
View file @
9e74afb4
...
...
@@ -136,10 +136,11 @@ class QuoteModel extends Model
}
else
if
(
!
empty
(
$map
[
'end_time'
]))
{
$query
->
where
(
'q.create_time'
,
'<='
,
$map
[
'end_time'
]);
}
});
})
->
where
(
'q.status'
,
'<>'
,
0
);
// 过滤报价草稿
if
(
$type
==
1
)
{
$list
=
$list
->
where
(
'q.create_uid'
,
$input
[
'user_id'
]);
$list
=
$list
->
where
(
'q.create_uid'
,
$input
[
'user_id'
]);
}
else
if
(
$type
==
2
)
{
$perm
=
new
PermController
;
$role
=
$perm
->
getUserRole
(
$input
[
'user_id'
],
$input
[
'email'
]);
// 用户角色
...
...
@@ -203,7 +204,7 @@ class QuoteModel extends Model
$quote_info
=
$this
->
find
(
$id
);
if
(
$quote_info
[
'status'
]
==
-
1
)
return
[
1
,
'该报价已撤销,请刷新页面查看'
];
if
(
$quote_info
[
'status'
]
>
1
)
return
[
1
,
'当前报价状态不能撤销,请刷新页面查看'
];
//
if ($quote_info['status'] > 1) return [1, '当前报价状态不能撤销,请刷新页面查看'];
$res
=
$this
->
where
(
'id'
,
$id
)
->
update
([
'status'
=>
-
1
,
'cancel_reason'
=>
$cancel_reason
]);
...
...
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