Browse Source

修改获取区域列表接口

qiuzijian 4 years ago
parent
commit
c654e886b6
2 changed files with 12 additions and 11 deletions
  1. 6 6
      .idea/workspace.xml
  2. 6 5
      Modules/Mine/Services/MineServices.php

+ 6 - 6
.idea/workspace.xml

@@ -72,8 +72,8 @@
       <file pinned="false" current-in-tab="true">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="591">
-              <caret line="104" column="17" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+            <state relative-caret-position="384">
+              <caret line="101" column="26" selection-start-line="101" selection-start-column="26" selection-end-line="101" selection-end-column="26" />
               <folding>
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
               </folding>
@@ -445,12 +445,12 @@
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="173006000" />
+      <workItem from="1618368497550" duration="173135000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="173149000" />
+    <option name="totallyTimeSpent" value="173278000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -838,8 +838,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="591">
-          <caret line="104" column="17" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+        <state relative-caret-position="384">
+          <caret line="101" column="26" selection-start-line="101" selection-start-column="26" selection-end-line="101" selection-end-column="26" />
           <folding>
           <folding>
             <element signature="e#127#148#0#PHP" expanded="true" />
             <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
           </folding>

+ 6 - 5
Modules/Mine/Services/MineServices.php

@@ -67,7 +67,7 @@ class MineServices{
             [
             [
                 'id as mine_id',
                 'id as mine_id',
                 'title as name',
                 'title as name',
-                'parent_id',
+                'parent_id as pid',
             ]
             ]
         )->get()->toArray();
         )->get()->toArray();
 
 
@@ -97,12 +97,13 @@ class MineServices{
         }
         }
         $num = 0;
         $num = 0;
         foreach ($mine_list as $key => $value) {
         foreach ($mine_list as $key => $value) {
-            if ($value['parent_id'] == $pid) {
+            if ($value['pid'] == $pid) {
                 $arr[$num]          = $value;
                 $arr[$num]          = $value;
-                $arr[$num]['children'] = self::sortMineList($mine_list, $value['mine_id']);
-                if ($pid != 0) {
-                    unset($arr[$num]['parent_id']);
+                if ($pid == 0) {
+                    $arr[$num]['parent_id'] = $value['mine_id'];
                 }
                 }
+                $arr[$num]['children'] = self::sortMineList($mine_list, $value['mine_id']);
+                unset($arr[$num]['pid']);
                 if (count($arr[$num]['children']) == 0) {
                 if (count($arr[$num]['children']) == 0) {
                     unset($arr[$num]['children']);
                     unset($arr[$num]['children']);
                 }
                 }