Compare commits

..

No commits in common. "a1db584b7201450a1223ec4c65de5fdba56f3dfc" and "cc06066746ba9b2eb9d8b17f0b29bab75b0d37a7" have entirely different histories.

1 changed files with 1 additions and 6 deletions

View File

@ -105,6 +105,7 @@ 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);
} }
@ -132,12 +133,6 @@ 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()));