From 0b643d15ab435b06f5fd2adccaca83621fd025de Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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..cc23be9 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
@@ -465,12 +465,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