fix20230331

apps/view_map/view.py

@@ -413,14 +413,13 @@ def attract_enterprise():
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
     try:
-        if not product:
-            enterprise = Enterprise.query.filter(or_(
-                Enterprise.c_type == inid,
-                Enterprise.c_type1 == inid,
-                Enterprise.c_type2 == inid
-            ))
+        enterprise = Enterprise.query.filter(or_(
+            Enterprise.c_type == inid,
+            Enterprise.c_type1 == inid,
+            Enterprise.c_type2 == inid
+        ))
 
-        enterprise_obj = enterprise.filter(
+        enterprise = enterprise.filter(
             # Enterprise.product_all.like("%{}%".format(product)) if product else text(''),
             Enterprise.entype.like('%{}%'.format(entype)) if entype else text(''),
             Enterprise.company_name.like('%{}%'.format(company_name)) if company_name else text(''),
@@ -447,12 +446,9 @@ def attract_enterprise():
             for product in product_li:
                 enterprise2 = ''
                 enterprise2 = enterprise.filter(or_(
-                    (Enterprise.product_all.like("%{}%".format(product)),
-                     Enterprise.c_type == inid),
-                    (Enterprise.product_all1.like("%{}%".format(product)),
-                     Enterprise.c_type1 == inid),
-                    (Enterprise.product_all2.like("%{}%".format(product)),
-                     Enterprise.c_type2 == inid)
+                    Enterprise.product_all.like("%{}%".format(product)),
+                    Enterprise.product_all1.like("%{}%".format(product)),
+                    Enterprise.product_all2.like("%{}%".format(product))
                 )).all()
                 company1 += enterprise2
             company1 = set(company1)
@@ -460,8 +456,8 @@ def attract_enterprise():
             company1 = sorted(company1, key=lambda x: x.hots, reverse=True)  # 排序
             enterprise_obj_list = company1[(page - 1) * perpage:page * perpage]  # 分页
         else:
-            size = enterprise_obj.count()
-            enterprise_obj_list = enterprise_obj.order_by(Enterprise.hots.desc()).paginate(page, perpage).items
+            size = enterprise.count()
+            enterprise_obj_list = enterprise.order_by(Enterprise.hots.desc()).paginate(page, perpage).items
 
         df = [{"id": i.id,
                "company_name": i.company_name,