1. 数据申请记录中移除了dataorder.status<0的情况 2. 我的数据中增加了geonetwork的查询
This commit is contained in:
parent
de03a3c368
commit
8efbef8128
|
@ -76,7 +76,7 @@ class AuthorController extends Zend_Controller_Action
|
||||||
$sql = "SELECT o.id,o.userid,o.unit,o.username,o.ts_created,o.project,m.title,m.uuid FROM onlineapp as o
|
$sql = "SELECT o.id,o.userid,o.unit,o.username,o.ts_created,o.project,m.title,m.uuid FROM onlineapp as o
|
||||||
LEFT JOIN metadata as m ON o.uuid=m.uuid
|
LEFT JOIN metadata as m ON o.uuid=m.uuid
|
||||||
LEFT JOIN mdauthor as a ON a.uuid=o.uuid
|
LEFT JOIN mdauthor as a ON a.uuid=o.uuid
|
||||||
WHERE (o.id in (SELECT distinct(onlineappid) from dataorder)) AND a.userid = ? AND a.status=1
|
WHERE (o.id in (SELECT distinct(onlineappid) from dataorder where status>=0)) AND a.userid = ? AND a.status=1
|
||||||
ORDER BY o.id desc";
|
ORDER BY o.id desc";
|
||||||
|
|
||||||
$sth = $this->db->prepare($sql);
|
$sth = $this->db->prepare($sql);
|
||||||
|
@ -284,7 +284,7 @@ class AuthorController extends Zend_Controller_Action
|
||||||
left join mdauthor a on a.uuid=d.uuid
|
left join mdauthor a on a.uuid=d.uuid
|
||||||
LEFT JOIN offlineapp offa on offa.id=d.offlineappid
|
LEFT JOIN offlineapp offa on offa.id=d.offlineappid
|
||||||
LEFT JOIN onlineapp ona on ona.id=d.onlineappid
|
LEFT JOIN onlineapp ona on ona.id=d.onlineappid
|
||||||
WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND a.status=1
|
WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND a.status=1 and d.status>=0
|
||||||
AND d.uuid=? AND a.userid=?
|
AND d.uuid=? AND a.userid=?
|
||||||
ORDER BY d.ts_created DESC";
|
ORDER BY d.ts_created DESC";
|
||||||
|
|
||||||
|
@ -430,8 +430,9 @@ class AuthorController extends Zend_Controller_Action
|
||||||
//列表
|
//列表
|
||||||
if(empty($ac) || $ac=='list'){
|
if(empty($ac) || $ac=='list'){
|
||||||
|
|
||||||
$sql = "SELECT a.*,m.title,m.description FROM normalmetadata m
|
$sql = "SELECT a.*,m.title,m.description,g.id as gid FROM normalmetadata m
|
||||||
LEFT JOIN mdauthor a ON m.uuid=a.uuid
|
LEFT JOIN mdauthor a ON m.uuid=a.uuid
|
||||||
|
left join geonetworkmetadata g on m.uuid=g.uuid
|
||||||
WHERE a.userid=? AND status>=0
|
WHERE a.userid=? AND status>=0
|
||||||
ORDER BY status DESC,a.id DESC
|
ORDER BY status DESC,a.id DESC
|
||||||
";
|
";
|
||||||
|
@ -1175,7 +1176,7 @@ class AuthorController extends Zend_Controller_Action
|
||||||
{
|
{
|
||||||
$sql = "SELECT md.title,c.author,c.email,c.url,c.ts_created,c.content FROM comments c
|
$sql = "SELECT md.title,c.author,c.email,c.url,c.ts_created,c.content FROM comments c
|
||||||
LEFT JOIN mdauthor a ON a.uuid=c.uuid
|
LEFT JOIN mdauthor a ON a.uuid=c.uuid
|
||||||
LEFT JOIN metadata md ON md.uuid=c.uuid
|
LEFT JOIN normalmetadata md ON md.uuid=c.uuid
|
||||||
WHERE a.userid=?
|
WHERE a.userid=?
|
||||||
ORDER BY ts_created DESC";
|
ORDER BY ts_created DESC";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue