wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-04 15:26:53 +08:00
parent cc06066746 40ea0ef7dd
commit a1db584b72
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
View File

@ -105,7 +105,6 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
wrapper.eq(params.get("district") != null, "district", params.get("district")); wrapper.eq(params.get("district") != null, "district", params.get("district"));
break; break;
case "areas": { // 区域 case "areas": { // 区域
logger.info("areas传参：{}", params.get("area").toString());
List<String> areas = JSONArray.parseArray(params.get("area").toString()).toJavaList(String.class); List<String> areas = JSONArray.parseArray(params.get("area").toString()).toJavaList(String.class);
wrapper.in(!areas.isEmpty(), "area", areas); wrapper.in(!areas.isEmpty(), "area", areas);
} }
@ -133,6 +132,12 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
limit = Long.parseLong((String) params.get(Constant.LIMIT)); limit = Long.parseLong((String) params.get(Constant.LIMIT));
} }
params.put("userId", SecurityUser.getUserId()); params.put("userId", SecurityUser.getUserId());
if (params.containsKey("senses")) {
params.put("senses", JSONArray.parseArray(params.get("senses").toString()).toJavaList(String.class).toArray());
}
if (params.containsKey("areas")) {
params.put("areas", JSONArray.parseArray(params.get("areas").toString()).toJavaList(String.class).toArray());
}
List<TbFuseDTO> dtoList = baseDao.getFuseDTOList(params); List<TbFuseDTO> dtoList = baseDao.getFuseDTOList(params);
dtoList.forEach(dto -> { dtoList.forEach(dto -> {
dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId())); dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId()));