Merge pull request #1070 from sejin7940/document_cou

문서수 출력하는 함수의 검색대상 제한 풀고,  카테고리 검색과 이메일 검색쪽 query 오류 수정
This commit is contained in:
bnu 2015-02-04 17:41:18 +09:00
commit 6d78362c10
7 changed files with 11 additions and 30 deletions

View file

@ -562,18 +562,9 @@ class documentModel extends document
*/
function getDocumentCount($module_srl, $search_obj = NULL)
{
// Additional search options
$args =new stdClass();
$args->module_srl = $module_srl;
$args->s_title = $search_obj->s_title;
$args->s_content = $search_obj->s_content;
$args->s_user_name = $search_obj->s_user_name;
$args->s_member_srl = $search_obj->s_member_srl;
$args->s_ipaddress = $search_obj->s_ipaddress;
$args->s_regdate = $search_obj->s_regdate;
$args->category_srl = $search_obj->category_srl;
$search_obj->module_srl = $module_srl;
$output = executeQuery('document.getDocumentCount', $args);
$output = executeQuery('document.getDocumentCount', $search_obj);
// Return total number of
$total_count = $output->data->count;
return (int)$total_count;
@ -586,17 +577,7 @@ class documentModel extends document
*/
function getDocumentCountByGroupStatus($search_obj = NULL)
{
// Additional search options
$args->module_srl = $search_obj->module_srl;
$args->s_title = $search_obj->s_title;
$args->s_content = $search_obj->s_content;
$args->s_user_name = $search_obj->s_user_name;
$args->s_member_srl = $search_obj->s_member_srl;
$args->s_ipaddress = $search_obj->s_ipaddress;
$args->s_regdate = $search_obj->s_regdate;
$args->category_srl = $search_obj->category_srl;
$output = executeQuery('document.getDocumentCountByGroupStatus', $args);
$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
if(!$output->toBool()) return array();
return $output->data;