tst

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/source/class/table/table_forum_forum.php" afterPath="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,11 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="419">
-              <caret line="150" column="104" lean-forward="true" selection-start-line="150" selection-start-column="104" selection-end-line="150" selection-end-column="104" />
+            <state relative-caret-position="450">
+              <caret line="151" column="41" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="41" />
               <folding />
             </state>
           </provider>
@@ -55,53 +56,54 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="615">
-              <caret line="301" column="15" lean-forward="false" selection-start-line="301" selection-start-column="15" selection-end-line="301" selection-end-column="15" />
+            <state relative-caret-position="109">
+              <caret line="303" column="55" lean-forward="false" selection-start-line="303" selection-start-column="20" selection-end-line="303" selection-end-column="55" />
               <folding>
-                <marker date="1525704316371" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-                <marker date="1525704316371" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-                <marker date="1525704316371" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-                <marker date="1525704316371" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-                <marker date="1525704316371" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-                <marker date="1525704316371" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-                <marker date="1525704316371" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-                <marker date="1525704316371" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-                <marker date="1525704316371" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-                <marker date="1525704316371" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-                <marker date="1525704316371" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-                <marker date="1525704316371" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-                <marker date="1525704316371" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="15161:15372" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="15419:15630" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525704316371" expanded="true" signature="16285:16342" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
+                <marker date="1525704782633" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
+                <marker date="1525704782633" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
+                <marker date="1525704782633" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
+                <marker date="1525704782633" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="4686:4821" ph="SELECT fid, " />
+                <marker date="1525704782633" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="6032:6122" ph="SELECT fid, " />
+                <marker date="1525704782633" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="7759:7872" ph="SELECT fid, " />
+                <marker date="1525704782633" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
+                <marker date="1525704782633" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
+                <marker date="1525704782633" expanded="true" signature="12172:12247" ph="INSERT INTO " />
+                <marker date="1525704782633" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
+                <marker date="1525704782633" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
+                <marker date="1525704782633" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
+                <marker date="1525704782633" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="16982:17110" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="17163:17388" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+                <marker date="1525704782633" expanded="true" signature="18046:18103" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
               </folding>
             </state>
           </provider>
@@ -234,9 +236,9 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forumfield.php" />
-        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
+        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
       </list>
     </option>
   </component>
@@ -351,12 +353,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="2807000" />
+      <workItem from="1525701498505" duration="3308000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="52195000" />
+    <option name="totallyTimeSpent" value="52696000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -732,105 +734,106 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="586">
-          <caret line="476" column="71" lean-forward="false" selection-start-line="476" selection-start-column="59" selection-end-line="476" selection-end-column="71" />
+        <state relative-caret-position="-423">
+          <caret line="69" column="23" lean-forward="false" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
+        <state relative-caret-position="0">
+          <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
           <folding>
-            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-423">
-          <caret line="69" column="23" lean-forward="false" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
+        <state relative-caret-position="248">
+          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
+    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="419">
-          <caret line="150" column="104" lean-forward="true" selection-start-line="150" selection-start-column="104" selection-end-line="150" selection-end-column="104" />
-          <folding />
+        <state relative-caret-position="314">
+          <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
+          <folding>
+            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
+        <state relative-caret-position="586">
+          <caret line="476" column="71" lean-forward="false" selection-start-line="476" selection-start-column="59" selection-end-line="476" selection-end-column="71" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
+        <state relative-caret-position="109">
+          <caret line="303" column="55" lean-forward="false" selection-start-line="303" selection-start-column="20" selection-end-line="303" selection-end-column="55" />
           <folding>
-            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525704782633" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
+            <marker date="1525704782633" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
+            <marker date="1525704782633" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
+            <marker date="1525704782633" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="4686:4821" ph="SELECT fid, " />
+            <marker date="1525704782633" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="6032:6122" ph="SELECT fid, " />
+            <marker date="1525704782633" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="7759:7872" ph="SELECT fid, " />
+            <marker date="1525704782633" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
+            <marker date="1525704782633" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
+            <marker date="1525704782633" expanded="true" signature="12172:12247" ph="INSERT INTO " />
+            <marker date="1525704782633" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
+            <marker date="1525704782633" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
+            <marker date="1525704782633" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
+            <marker date="1525704782633" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="15174:15385" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="16982:17110" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="17163:17388" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525704782633" expanded="true" signature="18046:18103" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
+    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="301" column="15" lean-forward="false" selection-start-line="301" selection-start-column="15" selection-end-line="301" selection-end-column="15" />
-          <folding>
-            <marker date="1525704316371" expanded="true" signature="645:715" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="1141:1217" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="1256:1333" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="1473:1546" ph="SELECT ff.*,... " />
-            <marker date="1525704316371" expanded="true" signature="1773:1830" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="2764:2840" ph="SELECT ff.*,... " />
-            <marker date="1525704316371" expanded="true" signature="2987:3193" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="3370:3696" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="3779:3858" ph="SELECT ff.*,... " />
-            <marker date="1525704316371" expanded="true" signature="4036:4190" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="4356:4603" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="4686:4821" ph="SELECT fid, " />
-            <marker date="1525704316371" expanded="true" signature="4932:5078" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="5160:5398" ph="SELECT ff.*,... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="5472:5574" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="5652:5777" ph="SELECT ff.* ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="5856:5941" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="6032:6122" ph="SELECT fid, " />
-            <marker date="1525704316371" expanded="true" signature="6980:7044" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="7235:7293" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="7409:7437" ph="SELECT sum(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="7536:7662" ph="SELECT SUM(t... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="7759:7872" ph="SELECT fid, " />
-            <marker date="1525704316371" expanded="true" signature="7999:8152" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="8337:8493" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="8545:8815" ph="SELECT f.fid... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="10669:10747" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="10917:11014" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="11107:11225" ph="SELECT fid F... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="11779:11874" ph="SELECT f.* $... " />
-            <marker date="1525704316371" expanded="true" signature="12022:12054" ph="SELECT fid F... " />
-            <marker date="1525704316371" expanded="true" signature="12172:12247" ph="INSERT INTO " />
-            <marker date="1525704316371" expanded="true" signature="12406:12439" ph="SELECT * FRO... " />
-            <marker date="1525704316371" expanded="true" signature="12589:12638" ph="DELETE FROM ${DB::table($this-&gt;_table)}... " />
-            <marker date="1525704316371" expanded="true" signature="12687:12741" ph="DELETE FROM ${DB::table('forum_forumfield')}... " />
-            <marker date="1525704316371" expanded="true" signature="13221:13302" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="13387:13635" ph="SELECT f.*, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="15005:15133" ph="SELECT count... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="15161:15372" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="15419:15630" ph="SELECT ${$fi... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525704316371" expanded="true" signature="16285:16342" ph="SELECT * FRO... ${DB::table('forum_'.$table)}" />
-          </folding>
+        <state relative-caret-position="450">
+          <caret line="151" column="41" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>

source/class/table/table_forum_forum.php

@@ -298,11 +298,47 @@ class table_forum_forum extends discuz_table
 		if($getcount) {
 			return DB::result_first("SELECT count(*) FROM ".DB::table($this->_table)." f $useindex WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql");
 		}
-		print_r("SELECT $fieldsql FROM ".DB::table($this->_table)." f $useindex LEFT JOIN ".DB::table("forum_forumfield")." ff ON ff.fid=f.fid WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql $orderby $limitsql");
-		exit();
 		return DB::fetch_all("SELECT $fieldsql FROM ".DB::table($this->_table)." f $useindex LEFT JOIN ".DB::table("forum_forumfield")." ff ON ff.fid=f.fid WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql $orderby $limitsql");
 	}
 
+    public function fetch_all_for_grouplist_by_province($province = null, $orderby = 'displayorder', $fieldarray = array(), $num = 1, $fids = array(), $sort = 0, $getcount = 0) {
+        if($fieldarray && is_array($fieldarray)) {
+            $fieldadd = '';
+            foreach($fieldarray as $field) {
+                $fieldadd .= $field.', ';
+            }
+        } else {
+            $fieldadd = 'ff.*, ';
+        }
+        $start = 0;
+        if(is_array($num)) {
+            list($start, $snum) = $num;
+        } else {
+            $snum = $num;
+        }
+        $orderbyarray = array('displayorder' => 'f.displayorder DESC', 'dateline' => 'ff.dateline DESC', 'lastupdate' => 'ff.lastupdate DESC', 'membernum' => 'ff.membernum DESC', 'thread' => 'f.threads DESC', 'activity' => 'f.commoncredits DESC');
+        $useindex = $orderby == 'displayorder' ? 'USE INDEX(fup_type)' : '';
+        $orderby = !empty($orderby) && $orderbyarray[$orderby] ? "ORDER BY ".$orderbyarray[$orderby] : '';
+        $limitsql = $num ? "LIMIT $start, $snum " : '';
+        $field = $sort ? 'fup' : 'fid';
+        $fids = $fids && is_array($fids) ? 'f.'.$field.' IN ('.dimplode($fids).')' : '';
+        if(empty($fids)) {
+            $levelsql = " AND f.level>'-1'";
+        }
+
+        if($province == null) {
+            $province_sql = '';
+        } else {
+            $province_sql = " AND ff.province = '$province'";
+        }
+
+        $fieldsql = $fieldadd.' f.fid, f.name, f.threads, f.posts, f.todayposts, f.level, as flevel ';
+        if($getcount) {
+            return DB::result_first("SELECT count(*) FROM ".DB::table($this->_table)." f $useindex WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql");
+        }
+        return DB::fetch_all("SELECT $fieldsql FROM ".DB::table($this->_table)." f $useindex LEFT JOIN ".DB::table("forum_forumfield")." ff ON ff.fid=f.fid WHERE".($fids ? " $fids AND " : '')." f.type='sub' AND f.status=3 $levelsql $province_sql $orderby $limitsql");
+    }
+
 	function fetch_table_struct($tablename, $result = 'FIELD') {
 		if(empty($tablename)) {
 			return array();

source/module/group/group_index.php

@@ -148,7 +148,8 @@ if(!$metadescription) {
 if(empty($curtype)) {
     if(!empty($_GET['province'])) {
         $_G['sg'] = [];
-        $_G['sg']['group_list'] = C::t('forum_forum')->fetch_all_for_grouplist('displayorder', '*', 10);
+        $_G['sg']['group_list'] = C::t('forum_forum')->fetch_all_for_grouplist_by_province('北京市', 'displayorder', '*', 10);
+        print_r($_G['sg']['group_list']);
         include template('diy:group/area');
     } else {
         include template('diy:group/index');