Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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;
 }

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -264,7 +264,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是否一致","记录删除失败");
+        }
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml

@@ -68,8 +68,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}