|
@@ -52,11 +52,9 @@ class SalesmanorderController extends AdminBaseController{ |
|
@@ -52,11 +52,9 @@ class SalesmanorderController extends AdminBaseController{ |
|
52
|
$money += $data_arr['data'][$key]['money'];
|
52
|
$money += $data_arr['data'][$key]['money'];
|
|
53
|
}
|
53
|
}
|
|
54
|
}
|
54
|
}
|
|
55
|
- $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
|
55
|
+ $data_school = Db::name('school') -> group('school') -> select() -> toArray();
|
|
56
|
foreach($data_school as $key => $val){
|
56
|
foreach($data_school as $key => $val){
|
|
57
|
- if(!empty($val['school'])){
|
|
|
|
58
|
- $school[$key] = $val['school'];
|
|
|
|
59
|
- }
|
57
|
+ $school[$key] = $val['school'];
|
|
60
|
}
|
58
|
}
|
|
61
|
$uid = Db::name('my_user') -> alias('a') -> join('user b','a.uid = b.id','LEFT') -> where('a.status = 2') -> select();
|
59
|
$uid = Db::name('my_user') -> alias('a') -> join('user b','a.uid = b.id','LEFT') -> where('a.status = 2') -> select();
|
|
62
|
/* foreach($uid as $key => $val){
|
60
|
/* foreach($uid as $key => $val){
|
