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
cfefcba9
Commit
cfefcba9
authored
Jul 10, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[0]
parent
948011a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
AppointmentTime.php
application/api/controller/AppointmentTime.php
+2
-2
Users.php
application/model/Users.php
+1
-1
No files found.
application/api/controller/AppointmentTime.php
View file @
cfefcba9
...
...
@@ -90,11 +90,11 @@ class AppointmentTime extends Basic
$user_where
[
'a.id'
]
=
$this
->
userId
;
$user_where
[
'b.site_id'
]
=
$site_id
;
$appoint_agent_id
=
$m_user
->
getAgentByCity
(
'c.id'
,
$user_where
);
if
(
empty
(
$appoint_agent_id
[
'id'
]))
{
if
(
empty
(
$appoint_agent_id
[
0
][
'id'
]))
{
$m_house_agent
=
new
GHousesToAgents
();
$appoint_agent_id
=
$m_house_agent
->
getAgentHouseValue
(
'agents_id'
,[
'houses_id'
=>
$params
[
"house_id"
],
'type'
=>
2
]);
}
else
{
$appoint_agent_id
=
$appoint_agent_id
[
'id'
];
$appoint_agent_id
=
$appoint_agent_id
[
0
][
'id'
];
}
$addPrams
=
array
(
'expect_time'
=>
date
(
"Y-m-d H:i:s"
,
$params
[
"expect_time"
]
/
1000
),
...
...
application/model/Users.php
View file @
cfefcba9
...
...
@@ -1101,7 +1101,7 @@ class Users extends Model
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"u_user_agent b"
,
"a.id = b.user_id"
,
"left"
)
->
join
(
"a_agents c"
,
"
a.agent_id=b
.id"
,
"left"
)
->
join
(
"a_agents c"
,
"
b.agent_id=c
.id"
,
"left"
)
->
where
(
$params
)
->
limit
(
1
)
->
select
();
...
...
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