cqpCow 1 anno fa
parent
commit
2596612b30
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      app/Service/OaService.php

+ 2 - 2
app/Service/OaService.php

@@ -1124,7 +1124,7 @@ class OaService extends Service
         $oa_order_id = array_values($map);
         $list = OaOrderSub::whereIn('oa_order_id', $oa_order_id)
             ->whereIn('state',[0,2])
-            ->select('id','state','oa_order_id')
+            ->select('id','state','oa_order_id','remark')
             ->orderBy('id', 'desc')
             ->get()->toArray();
         $subEmployeeList = OaOrderSubEmployee::whereIn('oa_order_id', $oa_order_id)
@@ -1155,7 +1155,7 @@ class OaService extends Service
                 $return[$order_no_tmp] = $emp_tmp_str;
             }else{
                 //驳回(原因)
-                $return[$order_no_tmp] = $v['state'] ?? "(未填写原因)";
+                $return[$order_no_tmp] = $v['remark'] ?? "(未填写原因)";
             }
         }