diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 02b64c2c..e593f2b7 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -3253,7 +3253,8 @@ class Admin_DataController extends Zend_Controller_Action //查看所有的未提交数据列表 else if((empty($ac) && empty($uuid))|| $ac=='list') { - $sql = "SELECT (regexp_matches(gn.data,'(.*)'))[1] as title,gn.id,gn.uuid,u.username,u.realname FROM en.geonetworkmetadata gn left join users u on gn.owner=u.id + $sql = "SELECT (regexp_matches(gn.data,'(.*)'))[1] as title,gn.id,gn.uuid,u.username,u.realname,t.count as version_count FROM en.geonetworkmetadata gn left join users u on gn.owner=u.id + left join (select count(*),uuid from en.mdversion group by uuid) t on t.uuid=gn.uuid WHERE gn.uuid not in (select uuid from en.metadata) order by gn.id desc "; diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index b6e79a5e..1e38a17c 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -2374,8 +2374,8 @@ class AuthorController extends Zend_Controller_Action // 保存数据作者信息 // 仅保存不存在的作者信息 $sql="insert into mdauthor (uuid,userid,ts_activated,status) select ?,?,now(),1 where not exists - (select * from mdauthor where uuid=? and userid=?)"; - $this->db->query($sql,array($row['uuid'],$u_id),$row['uuid'],$u_id)); + (select id from mdauthor where uuid=? and userid=?)"; + $this->db->query($sql,array($row['uuid'],$u_id),$row['uuid'],$u_id); // 2. 保存变化记录 save changelog & userid for the latest version $sql = "UPDATE en.mdversion SET changelog=?,userid=? WHERE id in (select id from en.mdversion where uuid=? order by ts_created desc limit 1)";