From c1d1c4dd78ea55a4a364b761826470212f79bdb0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 09:37:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 27f4325..8270408 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -243,9 +243,10 @@
}
SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
}
else if (order.getSubmitType().equals(2)){
- smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
}
order.setState("4");
entity.setState("7");
@@ -463,9 +464,13 @@
@ApiOperation(value = "删除工单",response = GuideRepairOrder.class)
@DeleteMapping("/delete/{id}")
@Authorization
- public ResultData deleteConfigById(@PathVariable("id") String id)
+ public ResultData deleteConfigById(@PathVariable("id") String id,@CurrentUser SysUser sysUser)
{
- return toAjax(iGuideRepairOrderService.deleteConfigById(id));
+ if(StringUtils.equals("1",sysUser.getUserType()) || StringUtils.equals("1",sysUser.getIsDivisionHead()) )
+ {
+ return toAjax(iGuideRepairOrderService.deleteConfigById(id));
+ }
+ return error("只有超管或者部门领导才能删除");
}
--
Gitblit v1.7.1