From 12eeb7e8a7bd17ee213a65d3a0aacb16a2624b62 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 17 Feb 2022 17:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tag/controller/OnlCgformTagController.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
index 756c094b2..854c0f18a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
@@ -12,6 +12,7 @@ import com.jero.modules.tag.service.IOnlCgformTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -115,14 +116,18 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-通过id删除")
 	@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	public Result<OnlCgformTag> delete(@RequestParam(name="id",required=true) String id) {
+		Result<OnlCgformTag> result = new Result<>();
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id);
-		if(onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly()==2){
-			return Result.error("固定字段,不可删除");
-		}else{
-			onlCgformTagService.deleteById(id);
-			return Result.OK("删除成功！");
+		if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) {
+			if (onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly() == 2) {
+				result.error("固定字段,不可删除");
+			} else {
+				onlCgformTagService.deleteById(id);
+				result.OK("删除成功！");
+			}
 		}
+		return result;
 	}
 
 	/**