|
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.bean.copier.CopyOptions;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.lang.tree.Tree;
|
|
|
+import cn.hutool.core.util.ObjUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.gis.common.util.Result;
|
|
|
import com.gis.domain.entity.*;
|
|
@@ -92,7 +93,9 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
List<WorkHotVO> workHotVOS = BeanUtil.copyToList(workHots, WorkHotVO.class, new CopyOptions().setIgnoreProperties(WorkHot::getFodderId, WorkHot::getContent));
|
|
|
workHotVOS.stream().forEach(v->{
|
|
|
WorkHot workHot = workHotMap.get(v.getId());
|
|
|
- v.setFodderId(JSON.parseArray(workHot.getFodderId()));
|
|
|
+ if (ObjUtil.isNotEmpty(workHot.getFodderId())){
|
|
|
+ v.setFodderId(JSON.parseArray(workHot.getFodderId()));
|
|
|
+ }
|
|
|
v.setContent(JSON.parseObject(workHot.getContent()));
|
|
|
});
|
|
|
|