From c724bc3cd0751e24046eac5c739f50d9ac5fa346 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 15 Apr 2022 15:10:56 +0800 Subject: [PATCH] =?UTF-8?q?bug50805,50679=E6=A0=87=E7=AD=BE=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=AD=97=E6=AE=B5=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=92=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 10 +++++----- .../controller/OnlCgformAreaController.java | 8 ++++---- .../tag/controller/OnlCgformTagController.java | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 96775e570..d97ff4ee2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -430,7 +430,7 @@ public class SysDictController { result.error500("未找到对应实体"); }else { if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(sysDict.getIsReadOnly()))) { result.error500("固定字段,不可修改"); }else{ sysDict.setUpdateTime(new Date()); @@ -460,7 +460,7 @@ public class SysDictController { Result result = new Result(); SysDict sysDict = sysDictService.queryById(id); if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(sysDict.getIsReadOnly()))) { result.error500("固定字段,不可删除"); } else { boolean ok = sysDictService.removeById(id); @@ -489,7 +489,7 @@ public class SysDictController { Result result = new Result(); try{ SysDict sysDict = sysDictService.queryById(id); - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(sysDict.getIsReadOnly()))) { result.error500("固定字段,不可删除"); } else { sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id); @@ -519,7 +519,7 @@ public class SysDictController { List idList = Arrays.asList(ids.split(",")); for (String list : idList) { SysDict midDict = sysDictService.getById(list); - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(midDict.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(sysDict.getIsReadOnly())) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(String.valueOf(midDict.getIsReadOnly()))) { return result.error500("包含固定字段,不可删除"); } else { sysDictService.removeByIds(idList); @@ -547,7 +547,7 @@ public class SysDictController { result.error500("参数不识别！"); }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(joinSystem.getIsReadOnly()))) { result.error500("包含固定字段,不可删除"); } else { sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 5226d90a6..dc6fe5246 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -95,7 +95,7 @@ public class OnlCgformAreaController extends JeroController 0) { //中英切换提示语 - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { return Result.error("同一所属模块下,展示区域名称不能重复！"); }else{ return Result.error("Under the same module, the display area name cannot be duplicate!"); @@ -121,7 +121,7 @@ public class OnlCgformAreaController extends JeroController 0) { //中英切换提示语 - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { return Result.error("同一所属模块下,展示区域名称不能重复！"); }else{ return Result.error("Under the same module, the display area name cannot be duplicate!"); @@ -187,7 +187,7 @@ public class OnlCgformAreaController extends JeroController idList = Arrays.asList(ids.split(",")); for(String list:idList){ OnlCgformTag midTag=onlCgformTagService.getById(list); - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(midTag.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly())) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) { //中英切换提示语 - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(midTag.getCut())) { result.error500("包含固定字段,不可删除"); }else{ result.error500("It contains fixed fields and cannot be deleted."); } }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly())) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) { //中英切换提示语 - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(midTag.getCut())) { result.error500("包含固定字段,不可删除"); }else{ result.error500("It contains fixed fields and cannot be deleted."); @@ -327,7 +327,7 @@ public class OnlCgformTagController extends JeroController改变状态,数据库不删 //中英切换提示语 - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(midTag.getCut())) { result.success("批量删除成功!"); }else{ result.success("Batch deletion succeeded!");