diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 80f43fd2..218b39e1 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -86,7 +86,7 @@ public class SysDictItem { @TableField(value = "`status`") @Dict(dicCode = "dict_item_status") @ApiModelProperty(value = "状态(1启用 0不启用)") - @Excel(name = "是否启用", width = 15, dicCode = "dict_item_status") + @Excel(name = "是否启用(启用/不启用)", width = 15, dicCode = "dict_item_status") private Integer status; /** diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml index 622ecd89..807434ac 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml @@ -10,7 +10,7 @@ sg.create_time, count(sug.id) as count, GROUP_CONCAT(sug.user_id) as ids, - GROUP_CONCAT(CONCAT(su.realname, '(', su.username, ')')) as userNames + GROUP_CONCAT(CONCAT(su.realname, '(', su.username, ')') ORDER BY su.realname, su.username) as userNames from sys_group sg LEFT JOIN sys_user_group sug on sg.id = sug.group_id LEFT JOIN sys_user su on sug.user_id = su.id diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 0e907742..0a7c36f6 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -236,7 +236,9 @@ public class SysDictServiceImpl extends ServiceImpl impl if (sysDictItemList != null) { for (SysDictItem entity : sysDictItemList) { entity.setDictId(sysDict.getId()); - entity.setStatus(1); + if (entity.getStatus() == null) { + entity.setStatus(1); + } entity.setIsReadOnly(0); entity.setIsTagDict(0); sysDictItemMapper.insert(entity); diff --git a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java index 02f1df2f..9956ca84 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java @@ -246,29 +246,28 @@ public class LawsTagController extends JeroController @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 result = new Result<>(); List 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查询 *