Merge branch 'master' into docker_package

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

@@ -100,6 +100,19 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                 case "updateDate":
                     wrapper.eq(StringUtils.isNotBlank(params.get("updateDate").toString()), "update_date", params.get("updateDate").toString());
                     break;
+                case "district": // 0 市级 1基层
+                    wrapper.eq(params.get("district") != null, "district", params.get("district"));
+                    break;
+                case "areas": { // 区域
+                    List<String> areas = (List<String>) params.get("areas");
+                    wrapper.in(areas.isEmpty(), "area", areas);
+                }
+                break;
+                case "senses": {
+                    List<String> senses = (List<String>) params.get("senses");
+                    wrapper.in(senses.isEmpty(), "application_area", senses);
+                }
+                break;
                 default:
                     break;
             }