获取区县级下拉

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -251,6 +251,17 @@ public class CustomerAgencyController {
         return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
     }
 
+    /**
+     * @param tokenDTO
+     * @return
+     * @Author sun
+     * @Description 工作端-查询当前人员所属组织及所有下级组织（到区县级）
+     **/
+    @PostMapping("staffinAgencyLevelList")
+    public Result<StaffInAgencyListResultDTO> staffinAgencyLevelList(@LoginUser TokenDto tokenDTO) {
+        return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffinAgencyLevelList(tokenDTO.getUserId()));
+    }
+
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
      * @param map

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -108,6 +108,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     List<AgencySubResultDTO> selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids);
 
+    List<AgencySubResultDTO>  selectSubAgencyLevelList(@Param("subAgencyPids") String subAgencyPids);
+
     /**
      * 查询客户根级组织
      *
@@ -195,6 +197,8 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 
+    AgencyResultDTO selectAgencyByLevelStaffId(@Param("staffId") String staffId);
+
     /**
      * @param customerId
      * @param pid

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -215,6 +215,9 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      **/
     StaffInAgencyListResultDTO staffInAgencyList(String staffId);
 
+    StaffInAgencyListResultDTO staffinAgencyLevelList(String staffId);
+
+
     /**
      * @Description 运营端-返回element ui - tree 结构agency列表
      * @param customerId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -686,6 +686,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return subAgencyList;
     }
 
+    private List<AgencySubResultDTO> getDepartmentLevelList(String subAgencyPids) {
+        List<AgencySubResultDTO> subAgencyList = baseDao.selectSubAgencyLevelList(subAgencyPids);
+        if (subAgencyList.size() > NumConstant.ZERO) {
+            for (AgencySubResultDTO sub : subAgencyList) {
+                List<AgencySubResultDTO> subAgency = getDepartmentLevelList(sub.getPids() + ":" + sub.getAgencyId());
+                sub.setSubAgencyList(subAgency);
+            }
+        }
+        return subAgencyList;
+    }
+
     /**
      * @param staffId
      * @return
@@ -1057,6 +1068,24 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    @Override
+    public StaffInAgencyListResultDTO staffinAgencyLevelList(String staffId) {
+        StaffInAgencyListResultDTO resultDTO = new StaffInAgencyListResultDTO();
+        //1.查询工作人员所属组织信息
+        AgencyResultDTO agencyList = baseDao.selectAgencyByStaffId(staffId);
+        if (null == agencyList) {
+            logger.error(String.format("查询工作人员所属组织信息失败，staffId->%s", staffId));
+            throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION);
+        }
+        resultDTO.setAgencyList(agencyList);
+
+        //2.递归查询所有下级组织信息
+        List<AgencySubResultDTO> subAgencyList = getDepartmentLevelList(("".equals(agencyList.getPids()) ? "" : agencyList.getPids() + ":") + agencyList.getAgencyId());
+        resultDTO.setSubAgencyList(subAgencyList);
+
+        return resultDTO;
+    }
+
     /**
      * @param customerId
      * @return com.epmet.dto.result.AgencyElementTreeResultDTO

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -210,6 +210,26 @@
         ORDER BY ca.created_time DESC
     </select>
 
+    <select id="selectSubAgencyLevelList" resultType="com.epmet.dto.result.AgencySubResultDTO">
+        SELECT
+            ca.id AS "agencyId",
+            ca.organization_name AS "agencyName",
+            ca.pids AS "pids",
+            ca.level level,
+            IFNULL(ca.longitude, cc.longitude) longitude,
+            IFNULL(ca.latitude, cc.latitude) latitude,
+            (
+                case when ca.pid is null or ca.pid='0' or ca.pid='' then ca.id
+                     else concat(ca.pids,':',ca.id)
+                    end)as orgIdPath
+        FROM customer_agency ca
+                 INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
+        WHERE ca.del_flag = '0'
+          AND ca.pids = #{subAgencyPids}
+          AND (ca.LEVEL = 'city' or ca.LEVEL = 'district')
+        ORDER BY ca.created_time DESC
+    </select>
+
     <select id="getCustomerRootAgency" resultType="com.epmet.dto.CustomerAgencyDTO">
         SELECT *
         FROM customer_agency ca