|
@@ -417,6 +417,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
|
|
String searchKey = param.getSearchKey();
|
|
String searchKey = param.getSearchKey();
|
|
Condition condition = new Condition(DirEntity.class);
|
|
Condition condition = new Condition(DirEntity.class);
|
|
condition.and().andEqualTo("userId", userName);
|
|
condition.and().andEqualTo("userId", userName);
|
|
|
|
+ condition.and().andEqualTo("type", param.getType());
|
|
if (StrUtil.isNotBlank(searchKey)){
|
|
if (StrUtil.isNotBlank(searchKey)){
|
|
searchKey = RegexUtil.sqlReplaceSpecialStr(searchKey);
|
|
searchKey = RegexUtil.sqlReplaceSpecialStr(searchKey);
|
|
condition.and().andLike("name", "%"+searchKey+"%");
|
|
condition.and().andLike("name", "%"+searchKey+"%");
|
|
@@ -431,7 +432,6 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
|
|
BeanUtils.copyProperties(dir, entity);
|
|
BeanUtils.copyProperties(dir, entity);
|
|
entity.setType("dir");
|
|
entity.setType("dir");
|
|
entity.setDirId(dir.getParentId());
|
|
entity.setDirId(dir.getParentId());
|
|
-
|
|
|
|
list.add(entity);
|
|
list.add(entity);
|
|
}
|
|
}
|
|
|
|
|