QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:基础模块bug修改

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class SysDictItem {
@TableField(value = "`status`") @TableField(value = "`status`")
@Dict(dicCode = "dict_item_status") @Dict(dicCode = "dict_item_status")
@ApiModelProperty(value = "状态（1启用 0不启用）") @ApiModelProperty(value = "状态（1启用 0不启用）")
@Excel(name = "是否启用", width = 15, dicCode = "dict_item_status") @Excel(name = "是否启用（启用/不启用）", width = 15, dicCode = "dict_item_status")
private Integer status; private Integer status;
/** /**
laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml
+1 -1
View File
@@ -10,7 +10,7 @@
sg.create_time, sg.create_time,
count(sug.id) as count, count(sug.id) as count,
GROUP_CONCAT(sug.user_id) as ids, 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 from sys_group sg
LEFT JOIN sys_user_group sug on sg.id = sug.group_id LEFT JOIN sys_user_group sug on sg.id = sug.group_id
LEFT JOIN sys_user su on sug.user_id = su.id LEFT JOIN sys_user su on sug.user_id = su.id
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+3 -1
View File
@@ -236,7 +236,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
if (sysDictItemList != null) { if (sysDictItemList != null) {
for (SysDictItem entity : sysDictItemList) { for (SysDictItem entity : sysDictItemList) {
entity.setDictId(sysDict.getId()); entity.setDictId(sysDict.getId());
entity.setStatus(1); if (entity.getStatus() == null) {
entity.setStatus(1);
}
entity.setIsReadOnly(0); entity.setIsReadOnly(0);
entity.setIsTagDict(0); entity.setIsTagDict(0);
sysDictItemMapper.insert(entity); sysDictItemMapper.insert(entity);
laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java
+14 -15
View File
@@ -246,29 +246,28 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
@RequiresPermissions("tag:logicDeleteBatch") @RequiresPermissions("tag:logicDeleteBatch")
public Result<?> logicDeleteBatch(@RequestBody IdsMapBody map) { public Result<?> logicDeleteBatch(@RequestBody IdsMapBody map) {
String ids = map.getIds(); String ids = map.getIds();
if(oConvertUtils.isEmpty(ids)) { if (oConvertUtils.isEmpty(ids)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA); return Result.error(ResultCommon.PLEASE_SELECT_DATA);
} }
Result<LawsTag> result = new Result<>();
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
for(String list:idList){ for (String id : idList) {
LawsTag midTag= lawsTagService.getById(list); LawsTag midTag = lawsTagService.getById(id);
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly())) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) { 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); return Result.error(ResultCommon.TAG_DELETE_ERROR_3);
}else { }
if (StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { if (StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly())) &&
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) { !FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(String.valueOf(midTag.getIsReadOnly()))) {
return Result.error(ResultCommon.TAG_DELETE_ERROR_3); lawsTagService.removeById(midTag.getId());
} else {
lawsTagService.removeById(midTag.getId());
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
}
} }
} }
return result; return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
} }
/** /**
* 通过id查询 * 通过id查询
* *