From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 10:33:15 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index f230b52..c804e74 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -401,6 +401,7 @@
throw new RuntimeException(e);
}
for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
+ transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
if (sysUser != null) {
smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
@@ -454,12 +455,12 @@
baseMapper.updateById(guideRepairOrder);
return ResultData.success("删除评论成功");
} else {
- ResultData.error("已办结的单据才能进行删除评论操作");
+ return ResultData.error("已办结的单据才能进行删除评论操作");
}
} else {
- ResultData.error("只能部门领导和超级管理员才能删除评论");
+ return ResultData.error("只能部门领导和超级管理员才能删除评论");
}
- return ResultData.error();
+
}
--
Gitblit v1.7.1