From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java |    5 ++---
 1 files changed, 2 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 cf22142..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
@@ -467,10 +467,9 @@
     {
         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