diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 7e3cb8b96..d36c03a08 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -119,7 +119,7 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<SysDeptEntity> selectListHeadDeptNode(@Param("dataScopeDeptList") List<Long> dataScopeDeptList);
 
     /**
-     * s
+     * 通过数据权限和上级机构列表查询下级机构id列表
      *
      * @param dataScopeDeptList
      * @param parentDeptIdList
@@ -136,15 +136,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Description
      * @Date 2019/12/4 20:22
      **/
-	List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
-
-
+    List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
 
 
     /**
-     *  @author: qushutong
-     *  @Date: 2019/12/13 14:17
-     *  @Description: 查询所有
+     * @author: qushutong
+     * @Date: 2019/12/13 14:17
+     * @Description: 查询所有
      */
     List<DeptTreeDTO> selectListDeptTree();
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 860c58995..08463940a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -423,7 +423,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         // 用于存放 每次组装好的 某一级节点。页面只需展示三级，所以没有存放顶级节点（市区）
         List<JSONArray> cache = Lists.newArrayList();
         Map<String, Object> object;
-        while (CollUtil.isNotEmpty(dataScopeDeptList)) {
+        while (CollUtil.isNotEmpty(dataScopeDeptList) && CollUtil.isNotEmpty(parentDeptIdList)) {
             // 通过上级节点组装所有下级节点
             object = this.packageChildrenNodeArray(parentNodeArray, dataScopeDeptList, parentDeptIdList);
 
@@ -446,7 +446,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
      * @param allParentNode     所有的上级机构节点
      * @param dataScopeDeptList 拥有数据权限的部门
      * @param parentDeptIdList  上级部门id
-     * @return java.util.Map<java.lang.String ,   java.lang.Object>
+     * @return java.util.Map<java.lang.String, java.lang.Object>
      * @author work@yujt.net.cn
      * @date 2019/11/29 10:27
      */
@@ -561,7 +561,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
 
-
     List<DeptTreeDTO> getOtherDept(List<DeptTreeDTO> deptList, JSONArray parent) {
         List<Long> already = Lists.newArrayList();
         for (int i = 0; i < parent.size(); i++) {
@@ -579,10 +578,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return others;
     }
 
-    
+
     /***
-     * 
-     * @param  
+     *
+     * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      * @author qushutong
      * @date 2019/12/13 14:50