Merge remote-tracking branch 'origin/dev_new_article'

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java

@@ -150,6 +150,7 @@ public class IcServiceProjectServiceImpl extends BaseServiceImpl<IcServiceProjec
         if (null == staffInfo){
             throw new EpmetException("未查询到此工作人员"+formDTO.getUserId());
         }
+        //查询当前组织及下级 的数据
         formDTO.setAgencyId(staffInfo.getAgencyId());
         PageInfo<ServiceProjectListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getServiceProjectList(formDTO));
         if (CollectionUtils.isNotEmpty(pageInfo.getList())){

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml

@@ -43,7 +43,7 @@
               AND ID = #{serviceProjectId}
           </if>
           <if test='null != agencyId and agencyId != "" '>
-              AND AGENCY_ID = #{agencyId}
+              AND AGENCY_ID_PATH like concat( '%',#{agencyId},'%')
           </if>
           <if test='null != serviceCategoryKey and serviceCategoryKey != "" '>
               AND SERVICE_CATEGORY_KEY = #{serviceCategoryKey}