更新高教计算

app/admin/controller/TalentAllowance.php

@@ -1258,10 +1258,10 @@ class TalentAllowance extends AdminController {
             //$set = array_intersect($set, $taxSet);
         } else if ($info["type"] == CommonConst::ENTERPRISE_GJ) {
             if ($info["backWork"] == 1) {
-                $set = array_intersect($set, $workdaySet);
+                //$set = array_intersect($set, $workdaySet);
                 $set = array_intersect($set, $wageSet);
             } else {
-                $set = array_intersect($set, $workdaySet);
+                //$set = array_intersect($set, $workdaySet);
                 $set = array_intersect($set, $wageSet);
             }
         } else {

app/common/api/TalentAllowanceApi.php

@@ -261,10 +261,10 @@ class TalentAllowanceApi {
             //$set = array_intersect($set, $taxSet);
         } else if ($info["type"] == CommonConst::ENTERPRISE_GJ) {
             if ($info["backWork"] == 1) {
-                $set = array_intersect($set, $workdaySet);
+                //$set = array_intersect($set, $workdaySet);
                 $set = array_intersect($set, $wageSet);
             } else {
-                $set = array_intersect($set, $workdaySet);
+                //$set = array_intersect($set, $workdaySet);
                 $set = array_intersect($set, $wageSet);
             }
         } else {