Преглед на файлове

集成电路津补贴交集月份修改

sugangqiang преди 9 месеца
родител
ревизия
a1110757f5
променени са 2 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 4 4
      app/admin/controller/TalentAllowance.php
  2. 4 4
      app/common/api/TalentAllowanceApi.php

+ 4 - 4
app/admin/controller/TalentAllowance.php

@@ -1249,10 +1249,10 @@ class TalentAllowance extends AdminController {
             $set = array_intersect($set, $workdaySet);
             $set = array_intersect($set, $wageSet);
             $checkSet = $set;
-            //$set = array_intersect($set, $pensionSet);
-            //$set = array_intersect($set, $unemploymentSet);
-            //$set = array_intersect($set, $medicaSet);
-            //$set = array_intersect($set, $taxSet);
+            $set = array_intersect($set, $pensionSet);
+            $set = array_intersect($set, $unemploymentSet);
+            $set = array_intersect($set, $medicaSet);
+            $set = array_intersect($set, $taxSet);
         }
         usort($set, function($a, $b) {
             return (int) $a - (int) $b;

+ 4 - 4
app/common/api/TalentAllowanceApi.php

@@ -282,10 +282,10 @@ class TalentAllowanceApi {
             $set = array_intersect($set, $workdaySet);
             $set = array_intersect($set, $wageSet);
             $checkSet = $set;
-            //$set = array_intersect($set, $pensionSet);
-            //$set = array_intersect($set, $unemploymentSet);
-            //$set = array_intersect($set, $medicaSet);
-            //$set = array_intersect($set, $taxSet);
+            $set = array_intersect($set, $pensionSet);
+            $set = array_intersect($set, $unemploymentSet);
+            $set = array_intersect($set, $medicaSet);
+            $set = array_intersect($set, $taxSet);
         }
         usort($set, function($a, $b) {
             return (int) $a - (int) $b;