发布v2.7.0版本

webmain/model/companyModel.php

@@ -75,4 +75,17 @@ class companyClassModel extends Model
 	{
 		m('userract')->update("`company`='$name'","`companyid`='$id'");//员工合同
 	}
+	
+	/**
+	*	所属单位名称
+	*/
+	public function comidname($comid)
+	{
+		if($comid && is_numeric($comid)){
+			$mors = $this->getXinxi($comid);
+			return arrvalue($mors, 'name');
+		}else{
+			 return $comid;
+		}
+	}
 }

webmain/model/flow/gongModel.php

@@ -173,7 +173,7 @@ class flow_gongClassModel extends flowModel
 			'order' 	=> '`istop` desc,`optdt` desc',
 			'keywere' 	=> $keywere,
 			'where' 	=> $whyere,
-			'fields'	=> 'id,typename,optdt,title,optname,zuozhe,indate,recename,fengmian,mintou,`status`,`istop`,`appxs`'
+			'fields'	=> 'id,typename,optdt,title,optname,zuozhe,indate,recename,fengmian,mintou,`status`,`istop`,`appxs`,`comid`'
 		);
 	}
 	

webmain/model/flow/userModel.php

@@ -37,7 +37,7 @@ class flow_userClassModel extends flowModel
 			$where.= " and instr(`deptpath`,'[$detpid]')>0";
 		}
 		return array(
-			'fields'=> '`name`,`id`,`id` as uid,`face`,`sort`,`deptallname`,deptpath,`ranking`,`tel`,`mobile`,`email`,`user`,num,workdate,sex,deptname,deptnames,superman,status,type,online,lastonline,isvcard,`companyid`',
+			'fields'=> '`name`,`id`,`id` as uid,`face`,`sort`,`deptallname`,deptpath,`ranking`,`tel`,`mobile`,`email`,`user`,num,workdate,sex,deptname,deptnames,superman,status,type,online,lastonline,isvcard,`companyid`,`comid`',
 			'order' => '`status` desc,`sort`',
 			'where' => $where
 		);

webmain/model/flowbillModel.php

@@ -136,6 +136,7 @@ class flowbillClassModel extends Model
 			$modename	= $rs['modename'];
 			$summary	= '';
 			$summarx 	= '';
+			$comidname 	= '';
 			$modenum 	= '';
 			$statustext	= '记录不存在';
 			$statusstr	= '不存在';
@@ -155,6 +156,7 @@ class flowbillClassModel extends Model
 				$rers 		= $this->db->getone('[Q]'.$rs['table'].'', $rs['mid']);
 				if($rers){
 					$tihsrs  = $flow->rsreplace($rers, 2, null, 1);
+					$comidname = $tihsrs['comidname'];
 					$summary = $this->rock->reparr($mors['summary'], $tihsrs);
 					$summarx = $this->rock->reparr($mors['summarx'], $tihsrs);
 	
@@ -190,6 +192,7 @@ class flowbillClassModel extends Model
 					if(!isempt($rs['checksm']))$cont.='<br>处理说明：'.$rs['checksm'].'';
 				}
 			}
+			if(ISMORECOM)$cont.='<br>所属单位※：'.$comidname.'';
 			
 			$srows[]= array(
 				'title' => $title,
@@ -298,6 +301,7 @@ class flowbillClassModel extends Model
 			$modename	= $rs['modename'];
 			$summary	= '';
 			$modenum 	= '';
+			$comidname	= '';
 			$statustext	= '记录不存在';
 			$statuscolor= '#888888';
 			$ishui 		= 0;
@@ -319,6 +323,7 @@ class flowbillClassModel extends Model
 					$tihsrs  = $flow->rsreplace($rers, 2, null, 1);
 					$summary = $this->rock->reparr($mors['summary'], $tihsrs);
 					
+					$comidname	 = $tihsrs['comidname'];//所属单位
 					$nowsets	 = $rs['nowcheckname']; //当前审核人
 					$ztarr 		 = $flow->getstatus($rers, $mors['statusstr'], $nowsets);
 					$statustext  = $ztarr[0];
@@ -349,6 +354,7 @@ class flowbillClassModel extends Model
 				'modename' 	=> $modename,
 				'modenum' 	=> $modenum,
 				'summary' 	=> $summary,
+				'comidname' => $comidname,
 				'status'	=> $statusstr
 			);
 		}

webmain/model/modeModel.php

@@ -113,6 +113,8 @@ class modeClassModel extends Model
 				}
 			}
 		}
+		
+		$farr[] = array('name'=>arrvalue($chufarr, 'comidname', lang('所属单位※')),'fields'=>'comidname','islb'=>(ISMORECOM)?1:0);
 	
 		$jgpstr 	= '<!--SCRIPTend-->';
 		$hstart 	= '<!--HTMLstart-->';