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

标签新增页-中英切换修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-06 22:20:09 +08:00
parent 694e01305b
commit 70ab065524
5 changed files with 21 additions and 15 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/SysCategoryController.java
+1
View File
@@ -74,6 +74,7 @@ public class SysCategoryController {
queryWrapper.eq("pid", sysCategory.getPid());
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------end
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId());
Page<SysCategory> page = new Page<SysCategory>(pageNo, pageSize);
IPage<SysCategory> pageList = sysCategoryService.page(page, queryWrapper);
result.setSuccess(true);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+7 -4
View File
@@ -197,13 +197,16 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
*/
@Override
public List<SysDict> queryDictName(String cut,SysDict sysDict) {
QueryWrapper<SysDict> QueryWrapper = new QueryWrapper<>();
QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
if (CutEnum.CN.getValue().equals(cut)) {
QueryWrapper.select("id", "dict_name", "attribute_type").eq("is_tag_dict", 1);
queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
}else{
QueryWrapper.select("id", "dict_en_name", "attribute_type").eq("is_tag_dict", 1);
queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
List<SysDict> resetlist = list(queryWrapper);
resetlist.stream().forEach(f->f.setDictName(f.getDictEnName()));
return resetlist;
}
return list(QueryWrapper);
return list(queryWrapper);
}
/**