diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 89f8764a30..05bcf1ad4b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -40,7 +40,7 @@
             <if test='serviceTimeEnd != null and serviceTimeEnd != ""'>
                 AND sr.SERVICE_TIME_END <![CDATA[ <= ]]> #{serviceTimeEnd}
             </if>
-        ORDER BY sr.CREATED_TIME DESC
+        ORDER BY sr.SERVICE_TIME_START DESC,sr.SERVICE_TIME_END DESC
     </select>
 
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index d7e0d5ff39..546c52b88f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -247,7 +247,7 @@
                 #{secondId}
             </foreach>
         </if>
-        order by ie.created_time desc, ie.latest_operated_time desc
+        order by ie.happen_time desc, ie.latest_operated_time desc
     </select>
 
     <select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
index 7611a80a9f..a78fae885d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -42,12 +42,12 @@ public class IcResiUserEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     *
+     * 组织Id
      */
 	private String agencyId;
 
     /**
-     *
+     * 组织的pids 含agencyId本身
      */
 	private String pids;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index c519210d7b..bfecfa4671 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectDao;
 import com.epmet.dao.IcResiMemberDao;
@@ -491,8 +492,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
             }
         }
-
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());
@@ -547,7 +552,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 新增人员
         IcResiUserEntity userEntity = new IcResiUserEntity();
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 !!!
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());