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("未找到对应实体");
}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<SysDict> result = new Result<SysDict>();
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<SysDict> result = new Result<SysDict>();
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<String> 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());