Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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