|
@@ -45,7 +45,7 @@ class EmployeeDailySalary extends Api
|
|
|
$rs = db('人事_基本资料')->column('员工编号,所在部门');
|
|
$rs = db('人事_基本资料')->column('员工编号,所在部门');
|
|
|
foreach($arr as $k=>$v){
|
|
foreach($arr as $k=>$v){
|
|
|
foreach($v as $key=>$value){
|
|
foreach($v as $key=>$value){
|
|
|
- $data[$k][$key] = str_replace(',', '', rtrim($rs[$value]));
|
|
|
|
|
|
|
+ $data[$k][$key]=rtrim($rs[$value]);
|
|
|
}
|
|
}
|
|
|
$data[$k]=array_unique($data[$k]);
|
|
$data[$k]=array_unique($data[$k]);
|
|
|
usort($data[$k], function($a, $b) {
|
|
usort($data[$k], function($a, $b) {
|