WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug50805,50679标签固定字段批量删除和提示语修改

Browse Source
This commit is contained in:
xiejunyu
2022-04-15 15:11:08 +08:00
parent 36715f44ba
commit c724bc3cd0
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+5 -5
View File
@@ -430,7 +430,7 @@ public class SysDictController {
result.error500("未找到对应实体"); result.error500("未找到对应实体");
}else { }else {
if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { 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("固定字段,不可修改"); result.error500("固定字段,不可修改");
}else{ }else{
sysDict.setUpdateTime(new Date()); sysDict.setUpdateTime(new Date());
@@ -460,7 +460,7 @@ public class SysDictController {
Result<SysDict> result = new Result<SysDict>(); Result<SysDict> result = new Result<SysDict>();
SysDict sysDict = sysDictService.queryById(id); SysDict sysDict = sysDictService.queryById(id);
if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { 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("固定字段,不可删除"); result.error500("固定字段,不可删除");
} else { } else {
boolean ok = sysDictService.removeById(id); boolean ok = sysDictService.removeById(id);
@@ -489,7 +489,7 @@ public class SysDictController {
Result<SysDict> result = new Result<SysDict>(); Result<SysDict> result = new Result<SysDict>();
try{ try{
SysDict sysDict = sysDictService.queryById(id); 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("固定字段,不可删除"); result.error500("固定字段,不可删除");
} else { } else {
sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id); sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id);
@@ -519,7 +519,7 @@ public class SysDictController {
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
for (String list : idList) { for (String list : idList) {
SysDict midDict = sysDictService.getById(list); 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("包含固定字段,不可删除"); return result.error500("包含固定字段,不可删除");
} else { } else {
sysDictService.removeByIds(idList); sysDictService.removeByIds(idList);
@@ -547,7 +547,7 @@ public class SysDictController {
result.error500("参数不识别！"); result.error500("参数不识别！");
}else { }else {
if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { 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("包含固定字段,不可删除"); result.error500("包含固定字段,不可删除");
} else { } else {
sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId()); sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+4 -4
View File
@@ -95,7 +95,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); int count=onlCgformAreaService.queryExitAreaName(onlCgformArea);
if (count > 0) { if (count > 0) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) {
return Result.error("同一所属模块下,展示区域名称不能重复！"); return Result.error("同一所属模块下,展示区域名称不能重复！");
}else{ }else{
return Result.error("Under the same module, the display area name cannot be duplicate!"); return Result.error("Under the same module, the display area name cannot be duplicate!");
@@ -121,7 +121,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); int count=onlCgformAreaService.queryExitAreaName(onlCgformArea);
if (count > 0) { if (count > 0) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) {
return Result.error("同一所属模块下,展示区域名称不能重复！"); return Result.error("同一所属模块下,展示区域名称不能重复！");
}else{ }else{
return Result.error("Under the same module, the display area name cannot be duplicate!"); return Result.error("Under the same module, the display area name cannot be duplicate!");
@@ -187,7 +187,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id);
if(onlCgformArea==null) { if(onlCgformArea==null) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
}else{ }else{
return Result.error("No corresponding data was found."); return Result.error("No corresponding data was found.");
@@ -232,7 +232,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
OnlCgformArea onlCgformArea = (OnlCgformArea) onlCgformAreaService.selectShowAreaById(id); OnlCgformArea onlCgformArea = (OnlCgformArea) onlCgformAreaService.selectShowAreaById(id);
if(onlCgformArea==null) { if(onlCgformArea==null) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
}else{ }else{
return Result.error("No corresponding data was found."); return Result.error("No corresponding data was found.");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+9 -9
View File
@@ -127,7 +127,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
} }
}else{ }else{
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformTag.getCut())) {
throw new JeroBootException("属性已存在,请检查"); throw new JeroBootException("属性已存在,请检查");
}else{ }else{
throw new JeroBootException("Attribute already exists, please check!"); throw new JeroBootException("Attribute already exists, please check!");
@@ -159,7 +159,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
checkData(); checkData();
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformTag.getCut())) {
return Result.error("固定字段,不可修改"); return Result.error("固定字段,不可修改");
}else{ }else{
return Result.error("Fixed field, which cannot be modified."); return Result.error("Fixed field, which cannot be modified.");
@@ -191,7 +191,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
} }
}else {//有未删数据,报错 }else {//有未删数据,报错
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformTag.getCut())) {
return Result.error("属性已存在,请检查"); return Result.error("属性已存在,请检查");
}else{ }else{
return Result.error("Attribute already exists, please check!"); return Result.error("Attribute already exists, please check!");
@@ -252,7 +252,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) { if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) {
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) {
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(onlCgformTag.getCut())) {
result.error500("固定字段,不可删除"); result.error500("固定字段,不可删除");
}else{ }else{
result.error500("Fixed field, cannot be deleted."); result.error500("Fixed field, cannot be deleted.");
@@ -307,18 +307,18 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
for(String list:idList){ for(String list:idList){
OnlCgformTag midTag=onlCgformTagService.getById(list); 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("包含固定字段,不可删除"); result.error500("包含固定字段,不可删除");
}else{ }else{
result.error500("It contains fixed fields and cannot be deleted."); result.error500("It contains fixed fields and cannot be deleted.");
} }
}else { }else {
if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { 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("包含固定字段,不可删除"); result.error500("包含固定字段,不可删除");
}else{ }else{
result.error500("It contains fixed fields and cannot be deleted."); result.error500("It contains fixed fields and cannot be deleted.");
@@ -327,7 +327,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1, midTag.getId()); onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1, midTag.getId());
//onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删 //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals("cut")) { if(CutEnum.CN.getValue().equals(midTag.getCut())) {
result.success("批量删除成功!"); result.success("批量删除成功!");
}else{ }else{
result.success("Batch deletion succeeded!"); result.success("Batch deletion succeeded!");