Merge branch 'master' into docker_package

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

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