电子围栏树结构适配

src/main/java/com/zcloud/mapper/datasource/electronicFence/ElectronicFenceMapper.java

@@ -25,6 +25,7 @@ public interface ElectronicFenceMapper {
     List<PageData> listAll(PageData pd);
 
     List<Map<String, Object>> listTree(PageData pd);
+    List<Map<String, Object>> listTreeApp(PageData pd);
 
     List<PageData> findByPId(PageData pd);
 }

src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java

@@ -50,6 +50,11 @@ public class ElectronicFenceServiceImpl implements ElectronicFenceService {
 
     @Override
     public List<Map<String, Object>> listTree(PageData pd) {
+        if ("children".equals(pd.getString("childKey"))) {
+            // 手机端
+            List<Map<String, Object>> dataList = electronicFenceMapper.listTreeApp(pd);
+            return buildTree(dataList, pd.getString("childKey"));
+        }
         List<Map<String, Object>> dataList = electronicFenceMapper.listTree(pd);
         return buildTree(dataList, pd.getString("childKey"));
     }

src/main/resources/mybatis/datasource/electronicFence/ElectronicFenceMapper.xml

@@ -177,6 +177,16 @@
         f
         where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} and f.PARENT_ID = #{ELECTRONIC_FENCE_AREA_ID}
     </select>
+    <select id="listTreeApp" resultType="java.util.Map">
+        SELECT
+            IFNULL(ELECTRONIC_FENCE_ID,ELECTRONIC_FENCE_AREA_ID) id,
+            ELECTRONIC_FENCE_AREA_NAME name,
+            PARENT_ID pId
+        FROM
+            electronic_fence f
+        WHERE
+            f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
+    </select>
 
 
     <!-- 批量删除 -->