Compare commits
No commits in common. "df5345475dfed9e69cddd7123da1f459a002d4c1" and "bd2219a6e42747340f7e4d5b1196a0e4fa4b9ba8" have entirely different histories.
df5345475d
...
bd2219a6e4
|
@ -105,6 +105,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
|
|||
wrapper.eq(params.get("district") != null, "district", params.get("district"));
|
||||
break;
|
||||
case "areas": { // 区域
|
||||
logger.info("areas传参:{}", params.get("area").toString());
|
||||
List<String> areas = JSONArray.parseArray(params.get("area").toString()).toJavaList(String.class);
|
||||
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));
|
||||
}
|
||||
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);
|
||||
dtoList.forEach(dto -> {
|
||||
dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId()));
|
||||
|
|
Loading…
Reference in New Issue