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
3af74448
Commit
3af74448
authored
Oct 29, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除字段拼接显示
parent
5a79c3e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OBargainModel.php
application/model/OBargainModel.php
+3
-3
No files found.
application/model/OBargainModel.php
View file @
3af74448
...
...
@@ -1063,14 +1063,14 @@ class OBargainModel extends Model
$m_agent
=
new
AAgents
();
$m_partial
=
new
OPartialCommission
();
$m_real
=
new
ORealIncome
();
$fields_str
=
'a.id,a.name,
a.phone,b.store_name,c.district
_name'
;
$fields_str
=
'a.id,a.name,
b.store
_name'
;
foreach
(
$data
as
$k
=>
$v
)
{
$result
[
$k
]
=
$v
;
if
(
isset
(
$v
[
'agent_id'
]))
{
$agent_data
=
$m_agent
->
getStoreDistrict
(
$fields_str
,
[
'a.id'
=>
$v
[
'agent_id'
]
]);
$result
[
$k
][
'agent'
]
=
$agent_data
[
'name'
]
.
'-'
.
$agent_data
[
'phone'
]
;
$result
[
$k
][
'district_store'
]
=
$agent_data
[
'
district_name'
]
.
'-'
.
$agent_data
[
'
store_name'
];
$result
[
$k
][
'agent'
]
=
$agent_data
[
'name'
];
$result
[
$k
][
'district_store'
]
=
$agent_data
[
'store_name'
];
}
if
(
isset
(
$v
[
'role'
]))
{
...
...
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