Forráskód Böngészése

手机判断,会议列表问题

q 1 éve
szülő
commit
5018ab9810

+ 1 - 3
index.php

@@ -31,9 +31,7 @@ if($_uurl != ''){
 
 // 只允许内网登录后台、APP登录使用
 $domain = $_SERVER['HTTP_HOST'];
-$we = $_REQUEST['d'];
-if ($we != 'we' && $domain != 'n.zq.oa.nxjiewei.com:8011' && $domain != 'oa.test') return;
-
+if (!$rock->ismobile() && $domain != 'n.zq.oa.nxjiewei.com:8011' && $domain != 'oa.test') return;
 
 $ajaxbool	= $rock->jm->gettoken('ajaxbool', 'false');
 $mode		= $rock->get('m', $m);

+ 1 - 1
webmain/model/flow/flow.php

@@ -57,7 +57,7 @@ class flowModel extends Model
 	protected function flowdatalog($arr){}
 	
 	//审核之前调用$zt 状态, $sm说明
-	protected function flowcheckbefore(){}
+	protected function flowcheckbefore($zt, $sm){}
 	
 	//审核完成后调用
 	protected function flowcheckafter($zt, $sm){}

+ 1 - 1
webmain/model/flow/meetingModel.php

@@ -12,7 +12,7 @@ class flow_meetingClassModel extends flowModel
         $this->hyarrb 	= array('green','blue','#ff6600','#888888');
         $this->dbobj	= c('date');
 
-        $this->defaultorder = 'start_time desc';
+//        $this->defaultorder = 'start_time desc';
 
         $this->meeting_room = m("meeting_room")->meetingRoomIdList();
 

+ 1 - 1
webmain/model/flow/workModel.php

@@ -22,7 +22,7 @@ class flow_workClassModel extends flowModel
 	}
 	
 	//转办时要更新对应的执行人员
-	protected function flowcheckbefore(){
+	protected function flowcheckbefore($zt, $sm){
 		$up = array();
 		if($this->checkiszhuanyi==1){
 			$up['dist'] 	= $this->rs['syszb_name'];