Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
1b126d23
Commit
1b126d23
authored
Apr 23, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
6394a280
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Bargain.php
application/api_broker/controller/Bargain.php
+1
-2
BargainService.php
application/api_broker/service/BargainService.php
+1
-2
OBargainModel.php
application/model/OBargainModel.php
+2
-0
No files found.
application/api_broker/controller/Bargain.php
View file @
1b126d23
...
@@ -114,7 +114,6 @@ class Bargain extends Basic
...
@@ -114,7 +114,6 @@ class Bargain extends Basic
public
function
bargainListSearchBargainId
()
public
function
bargainListSearchBargainId
()
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"submit_agent_id" => 93,
"submit_agent_id" => 93,
"status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销
"status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销
...
@@ -142,7 +141,7 @@ class Bargain extends Basic
...
@@ -142,7 +141,7 @@ class Bargain extends Basic
$agent_res
=
$this
->
agentModel
->
getAgentsInfoByAgentId
(
$agent_field
,
[
"agent_id"
=>
$submit_agent_id
]);
$agent_res
=
$this
->
agentModel
->
getAgentsInfoByAgentId
(
$agent_field
,
[
"agent_id"
=>
$submit_agent_id
]);
if
((
$agent_res
[
0
][
'level'
]
==
10
)
&&
(
$is_my_correlation
==
0
)){
if
((
$agent_res
[
0
][
'level'
]
==
10
)
&&
(
$is_my_correlation
==
0
)){
return
$this
->
response
(
"101"
,
"暂无权限!"
);
return
$this
->
response
(
"101"
,
"暂无权限!
2
"
);
}
}
/*业务员不允许点击查看全部成交报告 end*/
/*业务员不允许点击查看全部成交报告 end*/
...
...
application/api_broker/service/BargainService.php
View file @
1b126d23
...
@@ -51,11 +51,10 @@ class BargainService
...
@@ -51,11 +51,10 @@ class BargainService
$condition
[
"status"
]
=
21
;
$condition
[
"status"
]
=
21
;
break
;
break
;
case
5
://
调账
->
搜成交报告
不包括
待撤销和已撤销
case
5
://
调账
->
搜成交报告
不包括
待撤销和已撤销
$condition
[
"status"
]
=
array
(
'n
eq
'
,
'20,21'
);
$condition
[
"status"
]
=
array
(
'n
ot in
'
,
'20,21'
);
break
;
break
;
default
:
default
:
}
}
if
(
!
empty
(
$keyword
))
{
if
(
!
empty
(
$keyword
))
{
$condition
[
"keyword"
]
=
$keyword
;
$condition
[
"keyword"
]
=
$keyword
;
}
}
...
...
application/model/OBargainModel.php
View file @
1b126d23
...
@@ -297,6 +297,8 @@ class OBargainModel extends Model
...
@@ -297,6 +297,8 @@ class OBargainModel extends Model
->
page
(
$pageNo
)
->
page
(
$pageNo
)
->
select
();
->
select
();
//echo $this->db_->getLastSql();
//echo $this->db_->getLastSql();
// dump($this->db_->getLastSql());exit;
return
$result
;
return
$result
;
}
}
...
...
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