From 834689dd04dd5b47eefe66e661a47ac31413ee0a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 08 十二月 2022 09:38:56 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 ec79767..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");
@@ -465,12 +466,11 @@
@Authorization
public ResultData deleteConfigById(@PathVariable("id") String id,@CurrentUser SysUser sysUser)
{
- if(!StringUtils.equals("1",sysUser.getUserType()) || !StringUtils.equals("1",sysUser.getIsDivisionHead()) )
+ if(StringUtils.equals("1",sysUser.getUserType()) || StringUtils.equals("1",sysUser.getIsDivisionHead()) )
{
- return error("只有超管或者部门领导才能删除");
+ return toAjax(iGuideRepairOrderService.deleteConfigById(id));
}
-
- return toAjax(iGuideRepairOrderService.deleteConfigById(id));
+ return error("只有超管或者部门领导才能删除");
}
--
Gitblit v1.7.1