update:基础模块bug修改

This commit is contained in:
sunzheng
2024-07-30 14:53:59 +08:00
parent ed2ff88f13
commit 5bc5785a04
4 changed files with 19 additions and 18 deletions
@@ -246,29 +246,28 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
@RequiresPermissions("tag:logicDeleteBatch")
public Result<?> logicDeleteBatch(@RequestBody IdsMapBody map) {
String ids = map.getIds();
if(oConvertUtils.isEmpty(ids)) {
if (oConvertUtils.isEmpty(ids)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
Result<LawsTag> result = new Result<>();
List<String> idList = Arrays.asList(ids.split(","));
for(String list:idList){
LawsTag midTag= lawsTagService.getById(list);
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly())) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) {
for (String id : idList) {
LawsTag midTag = lawsTagService.getById(id);
if (midTag == null) {
continue;
}
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly())) ||
FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) {
return Result.error(ResultCommon.TAG_DELETE_ERROR_3);
}else {
if (StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) {
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) {
return Result.error(ResultCommon.TAG_DELETE_ERROR_3);
} else {
lawsTagService.removeById(midTag.getId());
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
}
}
if (StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly())) &&
!FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) {
lawsTagService.removeById(midTag.getId());
}
}
return result;
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
/**
* 通过id查询
*