npe
This commit is contained in:
parent
469cc7fac7
commit
4941922a1f
|
@ -99,11 +99,13 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
BeanUtils.copyProperties(resourceEntity, dto);
|
||||
|
||||
List<AttrEntity> attrEntities = dto.getInfoList();
|
||||
attrEntities.forEach(item -> {
|
||||
item.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
item.setDataResourceId(resourceID);
|
||||
attrDao.insert(item);
|
||||
});
|
||||
if (attrEntities != null) {
|
||||
attrEntities.forEach(item -> {
|
||||
item.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
item.setDataResourceId(resourceID);
|
||||
attrDao.insert(item);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -305,7 +307,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
HashMap<String, Object> resourceMap = new HashMap<>();
|
||||
resourceMap.put("type", "全部能力目录");
|
||||
QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("del_flag", 0).eq(StringUtils.isNotBlank(jsonObject.getString("type")),"type", jsonObject.getString("type"));
|
||||
queryWrapper.eq("del_flag", 0).eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"));
|
||||
resourceMap.put("total", resourceDao.selectCount(queryWrapper));
|
||||
//resourceMap.put("dataList", resourceDao.selectList(queryWrapper));
|
||||
resultList.add(resourceMap);
|
||||
|
|
Loading…
Reference in New Issue