Commit c568bea3 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.5' into MVP1.6.5

parents af91a863 61d407fe
...@@ -211,8 +211,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi ...@@ -211,8 +211,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
List<SysDictItem> allList = baseMapper.selectList(Wrappers.<SysDictItem>query().lambda() List<SysDictItem> allList = baseMapper.selectList(Wrappers.<SysDictItem>query().lambda()
.in(SysDictItem::getType,Common.initStrToList(itemTypes,CommonConstants.COMMA_STRING)) .in(SysDictItem::getType,Common.initStrToList(itemTypes,CommonConstants.COMMA_STRING))
.eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING) .eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING));
.eq(SysDictItem::getDisable,CommonConstants.ZERO_STRING));
extracted(allList, resultMap); extracted(allList, resultMap);
return R.ok(resultMap); return R.ok(resultMap);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment