From 77282a198ef717b0d4db4cd9d29df2a8188377d3 Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 12 Jun 2012 10:11:18 +0000 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8F=90=E4=BA=A4=E4=B8=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E9=87=8F=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=A5=E5=8F=8A=E7=A7=BB=E9=99=A4=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controllers/DataController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 074d88fa..11d95a10 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -1982,7 +1982,7 @@ class Admin_DataController extends Zend_Controller_Action $iso=new ISO19115(); $iso->saveDB($this->db,$row['xml']); //移除中间版本 - $sql="delete from mdversion where uuid in (select uuid from mdversion where v.id=?) and char_length(changelog)<3"; + $sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and char_length(changelog)<3"; $this->db->query($sql,array($id)); //修改评审状态为发布,且由其提交的用户进行管理 $sql="insert into mdstatus (uuid,status,userid) select uuid,6,? from mdversion where id=?"; @@ -2015,7 +2015,7 @@ class Admin_DataController extends Zend_Controller_Action return true; } } - else if ($row['id']==-1 || $row['id']==0 || $row['id']==1) //取消发布的数据,初始状态,已接收 + else if ($row['status']==-1 || $row['status']==0 || $row['status']==1) //取消发布的数据,初始状态,已接收 { //同步元数据 $iso=new ISO19115(); @@ -2068,7 +2068,7 @@ class Admin_DataController extends Zend_Controller_Action $this->jsonexit($data); return true; } - else if ($row['id']==2 || $row['id']==3 || $row['id']==4)//已发送过外审邮件,需由编辑告知变化信息 + else if ($row['status']==2 || $row['status']==3 || $row['status']==4)//已发送过外审邮件,需由编辑告知变化信息 { //email to admin $mail=new WestdcMailer($this->view->config->smtp); @@ -2144,13 +2144,13 @@ class Admin_DataController extends Zend_Controller_Action $this->jsonexit($data); return true; } - else if ($row['id']>=5)//数据已经发布,再次修改后将只通知管理员,保留发布状态 + else if ($row['status']>=5)//数据已经发布,再次修改后将只通知管理员,保留发布状态 { //同步元数据 $iso=new ISO19115(); $iso->saveDB($this->db,$row['xml']); //移除中间版本 - $sql="delete from mdversion where uuid in (select uuid from mdversion where v.id=?) and char_length(changelog)<3"; + $sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and char_length(changelog)<3"; $this->db->query($sql,array($id)); //email to admin & author