fix20230331

apps/view_map/view.py

@@ -413,6 +413,7 @@ 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,
@@ -446,9 +447,12 @@ def attract_enterprise():
             for product in product_li:
                 enterprise2 = ''
                 enterprise2 = enterprise.filter(or_(
-                    Enterprise.product_all.like("%{}%".format(product)),
-                    Enterprise.product_all1.like("%{}%".format(product)),
-                    Enterprise.product_all2.like("%{}%".format(product))
+                    (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)
                 )).all()
                 company1 += enterprise2
             company1 = set(company1)