Merge branch 'test' of ssh://39.155.253.71:33222/PHP/OA into test

webmain/model/flow/emfkModel.php

@@ -40,7 +40,7 @@ class flow_emfkClassModel extends flowModel
 
         $url = getconfig('base_url'). 'v2/payment?key=';
         $key = substr(md5(getconfig('openkey').date('Y-m-d')),0,12);
-        $url = $url.$key.'&git ='.$messType; //接口地址
+        $url = $url.$key.'&action='.$messType; //接口地址
         $url .= '&numb='.$this->rs['docnum'];
         $url .= '&status='.$status;
         m('log')->addlog('电费付款','接口返回信息: url '.$url);

webmain/task/openapi/openemfkAction.php

@@ -30,8 +30,10 @@ class openemfkClassAction extends openapiAction
         if (!empty($data['docnum'])) $this->data['docnum'] = $data['docnum']; //如果是编辑则携带编码
         $user = $this->getUser($data['uname']); //获取用户信息
         $data['applicant'] = $data['optname'] =  $user['name'];
-        $this->subdata = $this->getSubData($data['details']);
 
+        m('log')->addlog('电费付款','用户:'.$user['name']);
+
+        $this->subdata = $this->getSubData($data['details']);
         unset($data['details']);
         unset($data['uname']);