文档库--列表技术领域
This commit is contained in:
+8
-2
@@ -37,7 +37,6 @@ import com.jero.modules.system.entity.SysUser;
|
|||||||
import com.jero.modules.system.mapper.SysUserMapper;
|
import com.jero.modules.system.mapper.SysUserMapper;
|
||||||
import com.jero.modules.system.service.ISysAnnouncementService;
|
import com.jero.modules.system.service.ISysAnnouncementService;
|
||||||
import com.jero.modules.system.service.ISysUserService;
|
import com.jero.modules.system.service.ISysUserService;
|
||||||
import com.jero.modules.system.service.impl.SysBaseApiImpl;
|
|
||||||
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
||||||
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
|
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
|
||||||
import com.jero.modules.tag.entity.OnlCgformArea;
|
import com.jero.modules.tag.entity.OnlCgformArea;
|
||||||
@@ -1285,6 +1284,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
|
|
||||||
IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
|
IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
|
||||||
|
|
||||||
|
//树形数据字典
|
||||||
|
List<SysCategory> categoryList = sysCategoryService.list();
|
||||||
|
//过滤出树形字段
|
||||||
|
List<OnlCgformField> treeFieldList = fieldList.stream()
|
||||||
|
.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
|
||||||
|
.collect(Collectors.toList());
|
||||||
//数据字典
|
//数据字典
|
||||||
List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
|
List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
|
||||||
//下拉选处理数据字典
|
//下拉选处理数据字典
|
||||||
@@ -1295,10 +1300,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
idList.add((String) record1.get("id"));
|
idList.add((String) record1.get("id"));
|
||||||
for (Map.Entry<String, Object> entry : record1.entrySet()) {
|
for (Map.Entry<String, Object> entry : record1.entrySet()) {
|
||||||
List<OnlCgformField> collect = fieldList.stream()
|
List<OnlCgformField> collect = fieldList.stream()
|
||||||
.filter(e -> entry.getKey().equals(e.getDictField()))
|
.filter(e -> entry.getKey().equals(e.getDictField()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
//下拉选处理数据字典
|
//下拉选处理数据字典
|
||||||
dictItem(sysDictItems, entry, collect,cut);
|
dictItem(sysDictItems, entry, collect,cut);
|
||||||
|
treeDictItem(categoryList, entry, treeFieldList,cut);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//收藏和订阅
|
//收藏和订阅
|
||||||
|
|||||||
Reference in New Issue
Block a user