From ff9c1d7d1e8428d5ebe2b2fc6eea6981db5f0188 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 15 Feb 2022 14:48:56 +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=E5=86=85=E5=AE=B9-=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysDictItemController.java     | 12 ++++++------
 .../tag/controller/OnlCgformTagController.java       | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
index c48906567..1cec501ef 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
@@ -105,14 +105,14 @@ public class SysDictItemController {
 		}else {
 			if(sysDictItem.getIsReadOnly()==2){
 				result.error("固定字段,不可修改");
-			}else if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly() == 0){
+			}else {
 				sysDictItem.setUpdateTime(new Date());
 				boolean ok = sysDictItemService.updateById(sysDictItem);
 				//TODO 返回false说明什么？
 				if(ok) {
 					result.success("编辑成功!");
 				}
-			}else result.error("数据isReadOnly状态异常,请检查数据库!");
+			}
 		}
 		return result;
 	}
@@ -134,12 +134,12 @@ public class SysDictItemController {
 		}else {
 			if(joinSystem.getIsReadOnly()==2){
 				result.error("固定字段,不可修改");
-			}else if(joinSystem.getIsReadOnly() == 1 || joinSystem.getIsReadOnly() == 0){
+			}else {
 				boolean ok = sysDictItemService.removeById(id);
 				if(ok) {
 					result.success("删除成功!");
 				}
-			}else result.error("数据isReadOnly状态异常,请检查数据库!");
+			}
 
 		}
 		return result;
@@ -162,10 +162,10 @@ public class SysDictItemController {
 			SysDictItem sysDictItem = sysDictItemService.getById(ids);
 			if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly()==2){
 				result.error("固定字段,不可删除");
-			}else if(sysDictItem.getIsReadOnly() == 0){
+			}else {
 				this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));
 				result.success("批量删除成功!");
-			}else result.error("数据isReadOnly状态异常,请检查数据库!");
+			}
 		}
 		return result;
 	}
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 f1c70c7a3..b1d291c48 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
@@ -99,10 +99,10 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	public Result<?> edit(@Validated @RequestBody OnlCgformTag onlCgformTag) {
 		if(onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly()==2){
 			return Result.error("固定字段,不可修改");
-		}else if(onlCgformTag.getIsReadOnly() == 0){
+		}else {
 			onlCgformTagService.editById(onlCgformTag);
 			return Result.OK("编辑成功！");
-		}else return Result.error("数据isReadOnly状态异常,请检查数据库!");
+		}
 	}
 
 	/**
@@ -118,10 +118,10 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id);
 		if(onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly()==2){
 			return Result.error("固定字段,不可删除");
-		}else if(onlCgformTag.getIsReadOnly() == 0){
+		}else{
 			onlCgformTagService.deleteById(id);
 			return Result.OK("删除成功！");
-		}else return Result.error("数据isReadOnly状态异常,请检查数据库!");
+		}
 	}
 
 	/**
@@ -137,10 +137,10 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids);
 		if(onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly()==2){
 			return Result.error("固定字段,不可删除");
-		}else if(onlCgformTag.getIsReadOnly() == 0){
+		}else {
 			this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(",")));
 			return Result.OK("批量删除成功！");
-		}else return Result.error("数据isReadOnly状态异常,请检查数据库!");
+		}
 	}
 
 	/**