Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sunac-quanmin
Overview
Overview
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
HTML5-李恒逸
sunac-quanmin
Commits
7bb99c2c
Commit
7bb99c2c
authored
Jun 28, 2017
by
html5-李恒逸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改bug
parent
f1743476
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
distributionadmin.php
html/application/controllers/admin/distributionadmin.php
+1
-1
report.php
html/application/controllers/admin/report.php
+1
-1
No files found.
html/application/controllers/admin/distributionadmin.php
View file @
7bb99c2c
...
...
@@ -419,7 +419,7 @@ class Distributionadmin extends CI_Controller
$channelInfo
=
$query
->
result_array
();
//查找此销管 绑定 此分销商的所有项目,并且不允许修改
$buildings
=
$this
->
building_distributor
->
get_has_building
(
'R.
user_id ='
.
$uid
.
' and R.
distributor_id = '
.
$id
);
$buildings
=
$this
->
building_distributor
->
get_has_building
(
'R.distributor_id = '
.
$id
);
$this
->
data
[
'buildings'
]
=
$buildings
;
$this
->
data
[
'channelInfo'
]
=
$channelInfo
;
...
...
html/application/controllers/admin/report.php
View file @
7bb99c2c
...
...
@@ -1107,7 +1107,7 @@ class Report extends CI_Controller
if
(
!
empty
(
$manager_info
)
&&
$manager_info
[
'role_id'
]
==
'10'
)
{
$userInfo
=
$this
->
relate
->
get
(
array
(
'
user_id'
=>
$manager_id
,
'
distributor_id'
=>
$distributor_id
,
'building_id'
=>
$building_id
));
$userInfo
=
$this
->
relate
->
get
(
array
(
'distributor_id'
=>
$distributor_id
,
'building_id'
=>
$building_id
));
if
(
!
$userInfo
)
{
...
...
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