From e47b464ac4d630628caf313c0eb2e2068098ef97 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Thu, 22 Mar 2012 10:16:00 +0000 Subject: [PATCH] =?UTF-8?q?#303=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E6=97=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/controllers/AuthorController.php | 8 ++++---- .../default/views/scripts/author/view-dataoreder.phtml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index 6bf9305d..1e6cf99d 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -276,7 +276,7 @@ class AuthorController extends Zend_Controller_Action if(preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid)) { - $sql = "select md.title,d.uuid,d.authorpermitted + $sql = "select md.title,d.uuid,d.authorpermitted,d.status ,offa.id as offa_id,offa.username as offa_name,offa.unit as offa_unit,offa.email as offa_email,offa.project as offa_project ,ona.id as ona_id,ona.username as ona_name,ona.unit as ona_unit,ona.email as ona_email,ona.project as ona_project from dataorder d @@ -284,7 +284,7 @@ class AuthorController extends Zend_Controller_Action left join mdauthor a on a.uuid=d.uuid LEFT JOIN offlineapp offa on offa.id=d.offlineappid LEFT JOIN onlineapp ona on ona.id=d.onlineappid - WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND d.status=4 AND a.status=1 + WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND a.status=1 AND d.uuid=? AND a.userid=? ORDER BY d.ts_created DESC"; @@ -317,7 +317,7 @@ class AuthorController extends Zend_Controller_Action $sql = "select md.title,d.uuid,count(md.id) as c from dataorder d left join metadata md on md.uuid=d.uuid left join mdauthor a on a.uuid=d.uuid - where d.status=4 AND a.status=1 AND a.userid=? + where a.status=1 AND a.userid=? GROUP BY md.title,d.uuid"; $sth = $this->db->prepare($sql); @@ -348,7 +348,7 @@ class AuthorController extends Zend_Controller_Action $sql = "select md.title,d.uuid,count(md.id) as c from dataorder d left join metadata md on md.uuid=d.uuid left join mdauthor a on a.uuid=d.uuid - where d.status=4 AND a.status=1 AND a.userid=? AND (md.title like ? OR md.description like ?) + where a.status=1 AND a.userid=? AND (md.title like ? OR md.description like ?) GROUP BY md.title,d.uuid"; $sth = $this->db->prepare($sql); diff --git a/application/default/views/scripts/author/view-dataoreder.phtml b/application/default/views/scripts/author/view-dataoreder.phtml index cb3a26ba..67f53a32 100644 --- a/application/default/views/scripts/author/view-dataoreder.phtml +++ b/application/default/views/scripts/author/view-dataoreder.phtml @@ -39,7 +39,7 @@ $this->breadcrumb()->setSeparator(' > ');

单位:

项目:

-

+