Bläddra i källkod

侧边栏优化

曹鹤洋 1 år sedan
förälder
incheckning
3bc98c2789

+ 1 - 1
application/api/controller/EmployeeDailySalary.php

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

+ 1 - 1
application/api/controller/OvertimeVerification.php

@@ -45,7 +45,7 @@ class OvertimeVerification extends Api
         $rs = db('人事_基本资料')->column('员工编号,所在部门');
         foreach($arr as $k=>$v){
             foreach($v as $value){
-                $data[$k.count($v).'人)'][str_replace(',', '', rtrim($rs[$value]))][] = str_replace(',', '', rtrim($rs[$value]));
+                $data[$k.count($v).'人)'][rtrim($rs[$value])][]=rtrim($rs[$value]);
             }
             $j=0;
             foreach($data[$k.count($v).'人)'] as $keys=>$values){

+ 1 - 1
application/api/controller/RelatedSalaryAccounting.php

@@ -46,7 +46,7 @@ class RelatedSalaryAccounting extends Api
         $result = [];
         foreach ($rows as $row) {
             $date = $row['日期'];
-            $department = str_replace(',', '', rtrim($row['所在部门']));
+            $department = $row['所在部门'];
         
             if (!isset($result[$date])) {
                 $result[$date] = [