daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

信呼v2.5.2版本

Browse Source
This commit is contained in:
雨中磐石
2023-01-11 17:58:56 +08:00
parent db405df1ed
commit c0d49fd5ce
26 changed files with 276 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webmain/model/adminModel.php
View File

@@ -426,6 +426,7 @@ class adminClassModel extends Model
public function getuser($lx=0, $uid=0)
{
$fields = '`id`,`name`,`deptid`,`deptname`,`deptpath`,`groupname`,`deptallname`,`mobile`,`ranking`,`tel`,`face`,`sex`,`email`,`pingyin`,`deptids`,`isvcard`';
$this->allshow = false;
if($uid==0){
$uid = $this->adminid;
$where = m('view')->viewwhere('user', $uid, 'id');
@@ -474,6 +475,10 @@ class adminClassModel extends Model
//读取我可查看权限
if(contain($where,'1=1')){
$where = '';
if($this->rock->get('gtype')=='change'){
//$this->allshow = true;
//if(!ISMORECOM && c('cache')->get('deptuserjson'))return array();
}
}else{
$where = 'and ((1 '.$where.') or (`id`='.$uid.'))';
}
@@ -541,6 +546,7 @@ class adminClassModel extends Model
*/
public function updateinfo($where='')
{
if($where)c('cache')->del('deptuserjson');
$rows = $this->db->getall("select * from `[Q]admin` a where id>0 $where");
$total = $this->db->count;
$cl = 0;

1
webmain/model/deptModel.php
View File

@@ -122,6 +122,7 @@ class deptClassModel extends Model
'uarr' => $userarr,
'darr' => $deptarr,
'garr' => $garr,
'isall'=> $admindb->allshow
);
}

2
webmain/model/flow/flow.php
View File

File diff suppressed because one or more lines are too long

3
webmain/model/hrModel.php
View File

@@ -43,7 +43,8 @@ class hrClassModel extends Model
'quitdt' => $rs['quitdt']
), $rs['uid']);
m('admin')->update(array(
'quitdt' => $rs['quitdt']
'quitdt' => $rs['quitdt'],
'status' => '0'
), $rs['uid']);
if($bo)$db->update("`isover`=1", $rs['id']);
}

6
webmain/model/kaoqinModel.php
View File

@@ -798,13 +798,15 @@ class kaoqinClassModel extends Model
/**
* 判断这段时间是否可以申请请假
*/
public function leavepan($uid, $qjkind, $start, $end, $totals, $id=0)
public function leavepan($uid, $qjkind, $start, $end, $totals, $id=0, $kind='')
{
$msg = '';
$sdf = $this->db->rows('[Q]kqinfo',"`uid`='$uid' and `status`<>5 and ((`stime`<='$start' and `etime`>='$start') or (`stime`<='$end' and `etime`>='$end') or (`stime`>='$start' and `etime`<='$end')) and `kind`='请假' and `id`<>'$id' ");
if($kind=='')$kind = '请假';
$sdf = $this->db->rows('[Q]kqinfo',"`uid`='$uid' and `status`<>5 and ((`stime`<='$start' and `etime`>='$start') or (`stime`<='$end' and `etime`>='$end') or (`stime`>='$start' and `etime`<='$end')) and `kind`='$kind' and `id`<>'$id' ");
if($sdf > 0){
$msg = '该时间段已申请过了';
}
if($kind=='加班')return $msg;
$tsjia = '事假,病假';
$tsjia = m('option')->getval('kqsqtype', $tsjia); //读取选项
if($msg == '' && !$this->contain(','.$tsjia.',', ','.$qjkind.',')){

1
webmain/model/modeModel.php
View File

@@ -322,6 +322,7 @@ $rstr = "".$hstart."
$arr['collectm'] = '414,415,416';
$arr['eduxueqi'] = '419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435';
$arr['yqhealthy'] = '436,437';
$arr['wyxiaoqu'] = '438,439,440,441,442,443,444,445,446,447,448,449,450,451';
return $arr;
}