From 9985744a5977ff93aea7da7e1672005a1a08fb6c Mon Sep 17 00:00:00 2001
From: k10206 <k10206@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 8 Oct 2007 12:54:56 +0000
Subject: [PATCH] =?UTF-8?q?#176,=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EC=9D=98=20=ED=9A=8C=EC=9B=90=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=88=9C?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=95=EB=A0=AC=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2698 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/point.model.php                 | 51 +++++++++++++++++--
 modules/point/queries/getMemberList.xml       | 22 ++++++--
 .../queries/getMemberListWithinGroup.xml      | 35 +++++++++++++
 3 files changed, 100 insertions(+), 8 deletions(-)
 create mode 100644 modules/point/queries/getMemberListWithinGroup.xml

diff --git a/modules/point/point.model.php b/modules/point/point.model.php
index 105c4c5fe..f17efe2cf 100644
--- a/modules/point/point.model.php
+++ b/modules/point/point.model.php
@@ -57,9 +57,53 @@
          * @brief 포인트 순 회원목록 가져오기
          **/
         function getMemberList($args = null) {
-            // member model 객체 생성후 목록을 구해옴
-            $oMemberModel = &getAdminModel('member');
-            $output = $oMemberModel->getMemberList();
+
+            // 검색 옵션 정리
+            $args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
+            $args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+            $args->selected_group_srl = Context::get('selected_group_srl');
+
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                        break;
+                    case 'user_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_nick_name = $search_keyword;
+                        break;
+                    case 'email_address' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_email_address = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'last_login' :
+                            $args->s_last_login = $search_keyword;
+                        break;
+                    case 'extra_vars' :
+                            $args->s_extra_vars = $search_keyword;
+                        break;
+                }
+            }
+
+            // selected_group_srl이 있으면 query id를 변경 (table join때문에)
+            if($args->selected_group_srl) {
+                $query_id = 'point.getMemberListWithinGroup';
+            } else {
+                $query_id = 'point.getMemberList';
+            }
+
+            $output = executeQuery($query_id, $args);
 
             if($output->total_count) {
                 $oModuleModel = &getModel('module');
@@ -67,7 +111,6 @@
 
                 foreach($output->data as $key => $val) {
                     $point = $this->getPoint($val->member_srl);
-                    $output->data[$key]->point = $point;
                     $output->data[$key]->level = $this->getLevel($point, $config->level_step);
                 }
             }
diff --git a/modules/point/queries/getMemberList.xml b/modules/point/queries/getMemberList.xml
index c6621a67f..a03c40365 100644
--- a/modules/point/queries/getMemberList.xml
+++ b/modules/point/queries/getMemberList.xml
@@ -1,14 +1,28 @@
-<query id="getMemberListWithinGroup" action="select">
+<query id="getMemberList" action="select">
     <tables>
         <table name="member" alias="member"/>
         <table name="point" alias="point"/>
     </tables>
-    <columns />
+    <columns>
+        <column name="member.*" />
+        <column name="point.point" />
+    </columns>
     <conditions>
-        <condition operation="equal" column="member.member_srl" var="point.member_srl" pipe="and" notnull="notnull" />
+        <condition operation="equal" column="member.member_srl" var="point.member_srl" />
+        <condition operation="equal" column="is_admin" var="is_admin" pipe="and" />
+        <condition operation="equal" column="denied" var="is_denied" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="user_id" var="s_user_id" />
+            <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
+        </group>
     </conditions>
     <navigation>
-        <index var="sort_index" default="point.point" order="desc" />
+        <index var="sort_index" default="point" order="desc" />
         <list_count var="list_count" default="20" />
         <page_count var="page_count" default="10" />
         <page var="page" default="1" />
diff --git a/modules/point/queries/getMemberListWithinGroup.xml b/modules/point/queries/getMemberListWithinGroup.xml
new file mode 100644
index 000000000..f3ab2fad7
--- /dev/null
+++ b/modules/point/queries/getMemberListWithinGroup.xml
@@ -0,0 +1,35 @@
+<query id="getMemberListWithinGroup" action="select">
+    <tables>
+        <table name="member" alias="member"/>
+        <table name="point" alias="point"/>
+        <table name="member_group_member" alias="member_group"/>
+    </tables>
+    <columns>
+        <column name="member.*" />
+        <column name="point.point" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_group.group_srl" var="selected_group_srl" notnull="notnull" />
+        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
+        <condition operation="equal" column="member.member_srl" var="point.member_srl" pipe="and" />
+        <group pipe="and">
+            <condition operation="equal" column="member.is_admin" var="is_admin" />
+            <condition operation="equal" column="member.denied" var="is_denied" pipe="and" />
+        </group>
+        <group pipe="and">
+            <condition operation="like" column="member.user_id" var="s_user_id" />
+            <condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="member.email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
+            <condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="point" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>