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
58ed398b
Commit
58ed398b
authored
Jun 11, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开票税费修改
parent
eaecc773
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
GHouses.php
application/model/GHouses.php
+0
-1
OBargainModel.php
application/model/OBargainModel.php
+7
-3
No files found.
application/model/GHouses.php
View file @
58ed398b
...
...
@@ -207,7 +207,6 @@ class GHouses extends BaseModel
$dish_name
=
''
;
$result
[
$k
][
'dish_name'
]
=
''
;
$result
[
$k
][
'auth_edit_house'
]
=
1
;
foreach
(
$house_agents
as
$k2
=>
$v2
)
{
if
(
$v
[
'id'
]
==
$v2
[
'houses_id'
])
{
$dish_name
.=
$v2
[
'name'
]
.
','
;
...
...
application/model/OBargainModel.php
View file @
58ed398b
...
...
@@ -872,12 +872,16 @@ class OBargainModel extends Model
$data
=
$this
->
field
(
'role,agent_id,scale,scale_fee'
)
->
where
(
'id'
,
$bargain_id
)
->
where
(
'id'
,
'not in'
,
imp
ort
(
','
,
$bargain_id_arr
))
->
whereOr
(
'father_id'
,
$bargain_id
)
->
where
(
'id'
,
'not in'
,
imp
lode
(
','
,
$bargain_id_arr
))
//
->whereOr('father_id', $bargain_id)
->
select
();
if
(
!
empty
(
$partial_bargain
))
{
$data
=
array_merge
(
$partial_bargain
,
$data
);
}
$m_agent
=
new
AAgents
();
$result
=
[];
foreach
(
$data
as
$k
=>
$v
)
{
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