diff --git a/src/main/java/com/zcloud/mapper/datasource/electronicFence/ElectronicFenceMapper.java b/src/main/java/com/zcloud/mapper/datasource/electronicFence/ElectronicFenceMapper.java index 80f54ed..e0220f0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/electronicFence/ElectronicFenceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/electronicFence/ElectronicFenceMapper.java @@ -25,6 +25,7 @@ public interface ElectronicFenceMapper { List listAll(PageData pd); List> listTree(PageData pd); + List> listTreeApp(PageData pd); List findByPId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java b/src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java index a905dd4..d9c0495 100644 --- a/src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java +++ b/src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java @@ -50,6 +50,11 @@ public class ElectronicFenceServiceImpl implements ElectronicFenceService { @Override public List> listTree(PageData pd) { + if ("children".equals(pd.getString("childKey"))) { + // 手机端 + List> dataList = electronicFenceMapper.listTreeApp(pd); + return buildTree(dataList, pd.getString("childKey")); + } List> dataList = electronicFenceMapper.listTree(pd); return buildTree(dataList, pd.getString("childKey")); } diff --git a/src/main/resources/mybatis/datasource/electronicFence/ElectronicFenceMapper.xml b/src/main/resources/mybatis/datasource/electronicFence/ElectronicFenceMapper.xml index bfe06ec..963f570 100644 --- a/src/main/resources/mybatis/datasource/electronicFence/ElectronicFenceMapper.xml +++ b/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} +