|
@@ -1101,14 +1101,14 @@ class HolidayController extends DooController {
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
$hiredate = $staff['hiredate'];
|
|
$hiredate = $staff['hiredate'];
|
|
|
- $hireBiasDates = $staff['hireBiasDates'];
|
|
|
|
|
|
|
+ $hireBiasDate = $staff['hireBiasDate'];
|
|
|
if($hiredate == ''){
|
|
if($hiredate == ''){
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
Doo::loadModel('holidaystaff');
|
|
Doo::loadModel('holidaystaff');
|
|
|
$hstaff = new HStaff();
|
|
$hstaff = new HStaff();
|
|
|
$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$staff['sid'],'asArray' => TRUE));
|
|
$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$staff['sid'],'asArray' => TRUE));
|
|
|
- $hadyear = intval((time()-strtotime($hiredate) + 86400*$hireBiasDates)/(86400*365));
|
|
|
|
|
|
|
+ $hadyear = intval((time()-strtotime($hiredate) + 86400*$hireBiasDate)/(86400*365));
|
|
|
if($hadyear != $hstaffmsg['hadyear']){
|
|
if($hadyear != $hstaffmsg['hadyear']){
|
|
|
$hstaff->uid = $staff['sid'];
|
|
$hstaff->uid = $staff['sid'];
|
|
|
$hstaff->hadyear = $hadyear;
|
|
$hstaff->hadyear = $hadyear;
|
