From d3ad20f18e50550ac22f8a576904f938239d9b8d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 9 Oct 2022 17:34:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcTripReportRecordDao.xml        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index 15a413748b..83fc7aa431 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -65,8 +65,7 @@
 
     <update id="batchDel" parameterType="map">
         update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW()
-        WHERE USER_TYPE !='resi'
-        AND AGENCY_ID=#{agencyId}
+        WHERE  AGENCY_ID=#{agencyId}
         AND (
         <foreach collection="ids" item="id" separator=" OR ">
             id=#{id}

From fc468a71f9fb987c903b5ab2120ff9440c01812c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 9 Oct 2022 17:50:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=91=E4=B8=8D=E4=BF=A1=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=B8=80=E4=B8=8B=E7=9C=8B=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcTripReportRecordServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
index 97f5ed43e0..8b178718e3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
@@ -263,7 +263,10 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
     @Transactional(rollbackFor = Exception.class)
     public void delete(String customerId, String userId, String[] ids) {
         CustomerStaffInfoCacheResult staffInfo=queryCurrentStaff(customerId,userId);
-        baseDao.batchDel(userId,staffInfo.getAgencyId(),ids);
+        int delTotal=baseDao.batchDel(userId,staffInfo.getAgencyId(),ids);
+        if (0 == delTotal) {
+            throw  new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"行程上报删除失败，请确认组织id是否一致","记录删除失败");
+        }
     }
 
     /**

From cfb519630b7ca4a62935c5e649413153dc7e1e91 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 11 Oct 2022 09:25:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/CollectDetailResultDTO.java    | 2 ++
 .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
index 3f2f2f728b..8a71aa8ea9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
@@ -73,4 +73,6 @@ public class CollectDetailResultDTO implements Serializable {
     private String checkReason;
 
     private List<IcResiCollectMemDetailDTO> memberList;
+
+    private String orgIdPath;
 }
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 599f9e81f8..3d2cfd552b 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
@@ -224,6 +224,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "暂无查询到信息","暂无查询到信息");
         }
         CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
+        result.setOrgIdPath(StringUtils.isBlank(entity.getPids()) ? entity.getAgencyId() : entity.getPids()+":"+entity.getAgencyId());
         //查询成员信息
         List<IcResiCollectMemDetailDTO> memberList = icResiMemberDao.selectListByCollectId(dto.getId());
         result.setMemberList(memberList);