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

bug51788相关人员导入格式校验+bug51455订阅领域删除消息

Browse Source
This commit is contained in:
xiejunyu
2022-06-07 15:01:43 +08:00
parent 59b9bce658
commit 47d5be0a41
5 changed files with 18 additions and 6 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/SysDictItemController.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class SysDictItemController {
// QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByDesc("sort_order")
queryWrapper.orderByAsc("sort_order")
.eq("del_flag",CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId());
if(StringUtils.isNotEmpty(sysDictItem.getItemText())){
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+4 -1
View File
@@ -91,6 +91,9 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id", sysCategory.getSysDictId()).eq("del_flag",CommonConstant.DEL_FLAG_0);
if(StringUtils.isNotBlank(sysCategory.getPid())){
queryWrapper.eq("pid",sysCategory.getPid());
}
List<SysCategory> sysCategoryList = list(queryWrapper);
List<String> sysCategoryNameList = sysCategoryList.stream().map(e -> e.getName()).collect(Collectors.toList());
if(sysCategoryNameList.contains(sysCategory.getName())){
@@ -422,7 +425,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("pid",0)
.orderByDesc("sort_order");
.orderByAsc("sort_order");
List<SysCategory> list = list(queryWrapper);
return list;
}