发布v2.6.8版本

webmain/model/flow/carmreseModel.php

@@ -37,7 +37,7 @@ class flow_carmreseClassModel extends flowModel
 		$db 	= m('carmrese');
 		//读取车辆最后公里数
 		foreach($rows as $k=>$rs){
-			$onrs = $db->getone("`status`=1 and `carid`=".$rs['value']." and ifnull(`kmend`,'')<>''", '`kmend`,`kmstart`','`kmend` desc');
+			$onrs = $db->getone("`status`=1 and `carid`=".$rs['value']." and ifnull(`kmend`,0)<>0", '`kmend`,`kmstart`','`kmend` desc');
 			$km   = '';
 			if($onrs){
 				$km = $onrs['kmend'];

webmain/model/flow/goodsModel.php

@@ -3,8 +3,14 @@
 class flow_goodsClassModel extends flowModel
 {
 	
+	public $base;
+	public function initModel()
+	{
+		$this->base		= m('goods');
+	}
+	
 	protected function flowchangedata(){
-		$this->rs['typeid']	 = m('goods')->gettypename($this->rs['typeid']);
+		$this->rs['typeid']	 = $this->base->gettypename($this->rs['typeid']);
 	}
 
 	//导入数据的测试显示
@@ -40,6 +46,10 @@ class flow_goodsClassModel extends flowModel
 	//
 	public function flowrsreplace($rs, $lx=0)
 	{
+		
+		if(isset($rs['typeid']) && is_numeric($rs['typeid']))
+			$rs['typeid'] = $this->base->gettypename($rs['typeid']);
+		
 		//详情页下显示对应仓库库存
 		if($lx==1){
 			$drows = $this->db->getall("SELECT `depotid`,sum(count)count FROM `[Q]goodss` where aid=".$rs['id']." and `status`=1 GROUP BY `depotid`");
@@ -84,4 +94,18 @@ class flow_goodsClassModel extends flowModel
 		m('goodss')->delete('`aid`='.$this->id.'');
 		m('goods')->setstock();
 	}
+	
+	protected function flowbillwhere($uid, $lx)
+	{
+		$where  = '';
+		$typeid = $this->rock->post('typeid','0');
+		if($typeid!='0'){
+			$alltpeid = m('option')->getalldownid($typeid);
+			$where .= ' and `typeid` in('.$alltpeid.')';
+		}
+		return array(
+			'where' => $where,
+			'order' => 'optdt desc',
+		);
+	}
 }

webmain/model/flow/meetModel.php

@@ -51,15 +51,17 @@ class flow_meetClassModel extends flowModel
 		$nzt 		 = $zt;
 		$time 		 = time();
 		
-		$stime 	= strtotime($rs['startdt']);
-		$etime 	= strtotime($rs['enddt']);
-		if($zt < 2){
-			if($etime<$time){
-				$nzt = 2;
-			}else if($stime>$time){
-				$nzt = 0;
-			}else{
-				$nzt = 1;
+		if(!isempt($rs['startdt']) && !isempt($rs['enddt'])){
+			$stime 	= strtotime($rs['startdt']);
+			$etime 	= strtotime($rs['enddt']);
+			if($zt < 2){
+				if($etime<$time){
+					$nzt = 2;
+				}else if($stime>$time){
+					$nzt = 0;
+				}else{
+					$nzt = 1;
+				}
 			}
 		}
 		
@@ -231,9 +233,13 @@ class flow_meetClassModel extends flowModel
 	//每天运行计划任务将固定会议生成普通会议通知对应人
 	public function createmeet($id=0, $nowdt='', $gbrr=false)
 	{
-		$owhe 	= '';
-		if($id>0)$owhe='`id`='.$id.' and ';
-		$narr 	= $this->getall(''.$owhe.'`type`=1 and `status`=1');
+		if(is_array($id)){
+			$narr = $id;
+		}else{
+			$owhe 	= '';
+			if($id>0)$owhe='`id`='.$id.' and ';
+			$narr 	= $this->getall(''.$owhe.'`type`=1 and `status`=1');
+		}
 		$dtobj	= c('date');
 		$jlarr 	= array();
 		foreach($narr as $k=>$rs){

webmain/model/flow/subscribeinfoModel.php

@@ -87,7 +87,7 @@ class flow_subscribeinfoClassModel extends flowModel
 			$newid = $this->insert(array(
 				'mid' 		=> $id,
 				'receid' 	=> $receid,
-				'recename' 	=> $recename,
+				'recename' 	=> $this->rock->xssrepstr($recename),
 				'title' 	=> $title,
 				'cont' 		=> $cont,
 				'optdt' 	=> $this->rock->now,