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
fbd42b1d
Commit
fbd42b1d
authored
Mar 25, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
c8bc7676
Hide 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
-1
OrderLogService.php
application/api_broker/service/OrderLogService.php
+2
-2
OBargainModel.php
application/model/OBargainModel.php
+1
-1
No files found.
application/api_broker/controller/Bargain.php
View file @
fbd42b1d
...
...
@@ -60,7 +60,7 @@ class Bargain extends Basic
$agent_res
=
$this
->
agentModel
->
getAgentsInfoByAgentId
(
$agent_field
,
[
"agent_id"
=>
$submit_agent_id
]);
if
((
$agent_res
[
0
][
'level'
]
==
10
)
&&
(
$is_my_correlation
==
0
)){
return
$this
->
response
(
"
200
"
,
"暂无权限!"
);
return
$this
->
response
(
"
101
"
,
"暂无权限!"
);
}
/*业务员不允许点击查看全部成交报告 end*/
...
...
application/api_broker/service/OrderLogService.php
View file @
fbd42b1d
...
...
@@ -1370,8 +1370,8 @@ class OrderLogService
$params
[
"ids"
]
=
$ids
;
$bargainModel
=
new
OBargainModel
();
$filed
=
"a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id
,
d.id as house_id,d.internal_title,d.internal_address
"
;
$filed
=
"a.id,a.father_id,a.house_number,a.price,a.commission,a.agent_id,a.create_time,b.user_phone
,
b.user_name,b.user_id,c.id as order_id,c.order_no,d.id as house_id,d.internal_title,d.internal_address,b.id as report_id
"
;
$result
=
$bargainModel
->
selectBargainList
(
$filed
,
$params
,
$pageNo
,
$pageSize
);
$list
=
[];
foreach
(
$result
as
$k
=>
$v
)
{
...
...
application/model/OBargainModel.php
View file @
fbd42b1d
...
...
@@ -257,7 +257,7 @@ class OBargainModel extends Model
$where_
[
"a.father_id"
]
=
$params
[
"father_id"
];
}
if
(
!
isset
(
$params
[
"type"
])
&&
isset
(
$params
[
"keyword"
]))
{
if
(
!
isset
(
$params
[
"type"
])
&&
isset
(
$params
[
"keyword"
]))
{
$where_
[
"b.user_phone|b.user_name|d.internal_address"
]
=
array
(
"like"
,
"%"
.
$params
[
"keyword"
]
.
"%"
);
}
...
...
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