diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java
index 63ffd96..7cf7ab5 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java
@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.PartyOrgTypeDTO;
+import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO;
 import com.elink.esua.epdc.excel.PartyOrgTypeExcel;
 import com.elink.esua.epdc.service.PartyOrgTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("partyorgtype")
 public class PartyOrgTypeController {
-    
+
     @Autowired
     private PartyOrgTypeService partyOrgTypeService;
 
@@ -91,4 +92,15 @@ public class PartyOrgTypeController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgTypeExcel.class);
     }
 
-}
\ No newline at end of file
+    /*
+     * 获取 党组织类型，用于下拉选项
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO>>
+     * @Author zhangyong
+     * @Date 15:28 2021-08-06
+     **/
+    @GetMapping("getPartyOrgType")
+    public Result<List<PartyOrgTypeSelectDTO>> getPartyOrgType() {
+        return new Result<List<PartyOrgTypeSelectDTO>>().ok(partyOrgTypeService.getPartyOrgType());
+    }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
index c33a632..61ebd3d 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
@@ -18,10 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO;
 import com.elink.esua.epdc.entity.PartyOrgTypeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 党组织类型表 党组织类型表
  *
@@ -52,4 +55,13 @@ public interface PartyOrgTypeDao extends BaseDao<PartyOrgTypeEntity> {
      * @Date 10:55 2021-04-28
      **/
     Integer isTypeNameRepeated(@Param("typeName") String typeName, @Param("id") String id);
+
+    /*
+     * 获取 党组织类型，用于下拉选项
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO>
+     * @Author zhangyong
+     * @Date 15:28 2021-08-06
+     **/
+    List<PartyOrgTypeSelectDTO> getPartyOrgType();
 }
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java
index 25f14ae..e9a8056 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java
@@ -19,7 +19,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PartyOrgTypeDTO;
+import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO;
 import com.elink.esua.epdc.entity.PartyOrgTypeEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface PartyOrgTypeService extends BaseService<PartyOrgTypeEntity> {
      * @date 2021-08-06
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    /*
+     * 获取 党组织类型，用于下拉选项
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO>
+     * @Author zhangyong
+     * @Date 15:28 2021-08-06
+     **/
+    List<PartyOrgTypeSelectDTO> getPartyOrgType();
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java
index ef4f515..9a6c45f 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java
@@ -20,12 +20,15 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.PartyOrgDao;
+import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.PartyOrgDTO;
 import com.elink.esua.epdc.entity.PartyOrgEntity;
+import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
 import com.elink.esua.epdc.redis.PartyOrgRedis;
 import com.elink.esua.epdc.service.PartyOrgService;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +51,8 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
 
     @Autowired
     private PartyOrgRedis partyOrgRedis;
+    @Autowired
+    private OptSysDeptService optSysDeptService;
 
     @Override
     public PageData<PartyOrgDTO> page(Map<String, Object> params) {
@@ -77,13 +82,22 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
     @Override
     public PartyOrgDTO get(String id) {
         PartyOrgEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PartyOrgDTO.class);
+        PartyOrgDTO dto = ConvertUtils.sourceToTarget(entity, PartyOrgDTO.class);
+        if (null != dto && null != dto.getAllDeptIds()) {
+            String[] split = dto.getAllDeptIds().split(",");
+            // 去除，顶级组织
+            String[] allDeptIdArr = new String[split.length - NumConstant.ONE];
+            System.arraycopy(split, NumConstant.ONE, allDeptIdArr, NumConstant.ZERO,split.length - NumConstant.ONE);
+            dto.setAllDeptIdArr(allDeptIdArr);
+        }
+        return dto;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyOrgDTO dto) {
         PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.class);
+        this.packageOrgLevel(entity, Long.valueOf(dto.getDeptId()));
         insert(entity);
     }
 
@@ -91,9 +105,27 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
     @Transactional(rollbackFor = Exception.class)
     public void update(PartyOrgDTO dto) {
         PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.class);
+        this.packageOrgLevel(entity, Long.valueOf(dto.getDeptId()));
         updateById(entity);
     }
 
+    /**
+     * 组装部门层级
+     *
+     * @param entity
+     * @param deptId
+     * @return void
+     * @Author zhangyong
+     * @Date 16:25 2021-08-06
+     **/
+    private void packageOrgLevel(PartyOrgEntity entity, Long deptId) {
+        DeptLevelAndLeaderDTO deptLevel = optSysDeptService.getDeptLevelById(deptId);
+        entity.setAllDeptIds(deptLevel.getAllDeptIds());
+        entity.setAllDeptNames(deptLevel.getAllDeptNames());
+        entity.setParentDeptIds(deptLevel.getParentDeptIds());
+        entity.setParentDeptNames(deptLevel.getParentDeptNames());
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -101,4 +133,4 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
index 006fb26..f39b9a1 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.PartyOrgDao;
 import com.elink.esua.epdc.dao.PartyOrgTypeDao;
 import com.elink.esua.epdc.dto.PartyOrgTypeDTO;
+import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO;
 import com.elink.esua.epdc.entity.PartyOrgTypeEntity;
 import com.elink.esua.epdc.redis.PartyOrgTypeRedis;
 import com.elink.esua.epdc.service.PartyOrgTypeService;
@@ -135,4 +136,8 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl<PartyOrgTypeDao, Pa
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PartyOrgTypeSelectDTO> getPartyOrgType() {
+        return baseDao.getPartyOrgType();
+    }
 }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
index 4b41a56..b3ec3dc 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
@@ -38,4 +38,12 @@
             AND ID != #{id}
         </if>
     </select>
+
+    <select id="getPartyOrgType" resultType="com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO">
+        SELECT
+            TYPE_CODE tagValue,
+            TYPE_NAME tagName
+        FROM epdc_party_org_type
+        WHERE DEL_FLAG = '0'
+    </select>
 </mapper>