Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

common/helpers/bonus/BonusCalc.php

@@ -1703,7 +1703,7 @@ class BonusCalc extends BaseObject {
             }
 
             // 会员级别+聘级都达到要求才会发放奖金
-            if (in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel) && in_array($userStarDirectorObj[$userId]['LEVEL_ID'], $minEmpLevel)) {
+            if (in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel)) {
                 // 放入缓存
                 CalcCache::tourismBonus($userId, $this->_periodNum, $amount);
                 // 加入月奖的会员
@@ -1800,7 +1800,7 @@ class BonusCalc extends BaseObject {
             $amount = ($amount > $capBonus) ? $capBonus : $amount;
 
             // 会员级别+聘级都达到要求才会发放奖金
-            if (in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel) && in_array($userStarDirectorObj[$userId]['LEVEL_ID'], $minEmpLevel)) {
+            if (in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel)) {
                 // 放入缓存
                 CalcCache::garageBonus($userId, $this->_periodNum, $amount);
                 // 加入月奖的会员