修正分类性质 条件查询分页折叠展示效果(与非条件查询逻辑一致)

This commit is contained in:
zhangshilin
2018-03-09 10:27:53 +08:00
parent 67645d21ca
commit efcf720d12
3 changed files with 19 additions and 8 deletions

View File

@@ -153,18 +153,28 @@ public class SysDictInfoController extends BaseController {
//删除所有重复
for(int i=allList.size()-1;i>=0;i--){
SysDictInfo se = allList.get(i);
System.out.println("山前顺序"+se.getSysDictId());
//System.out.println("删前顺序"+se.getSysDictId());
if(se!=null&&se.getSysDictId()!=null){
if(tempList.contains(se.getSysDictId())){
allList.remove(se);
}
}
}
/* for(int i=allList.size()-1;i>=0;i--){
SysDictInfo se = allList.get(i);
System.out.println("删后顺序"+se.getSysDictId());
}*/
allList.addAll(page.getList());
SysDictInfo.sortList(list,allList,0,true);
/*for(int i=list.size()-1;i>=0;i--){
SysDictInfo se = list.get(i);
System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
}*/
model.addAttribute("itType", itType);
model.addAttribute("intArr", Arrays.asList(intArr));
model.addAttribute("list", list);