fix

apps/attract/view.py

@@ -86,11 +86,16 @@ def attract_map():
         if province and city and district:  # 区数据
         if province and city and district:  # 区数据
             num = enterprise.filter_by(province=province, city=city, district=district).count()
             num = enterprise.filter_by(province=province, city=city, district=district).count()
             district_data = Enterprise.query.filter_by(province=province, city=city, district=district).first()
             district_data = Enterprise.query.filter_by(province=province, city=city, district=district).first()
+            print(district_data)
+            if district_data:
                 df.append({"name": district,
                 df.append({"name": district,
                            "value": num,
                            "value": num,
                            "color": "",
                            "color": "",
                            "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
                            "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
                 return jsonify(code=RET.OK, msg="获取成功", data=df)
                 return jsonify(code=RET.OK, msg="获取成功", data=df)
+            else:
+                return jsonify(code=RET.OK, msg="无满足条件数据", data=df)
+
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
@@ -200,12 +205,14 @@ def enterprise():
 
 
 
 
 # 招商地图下的散点图（至区后）
 # 招商地图下的散点图（至区后）
-@api_map.route('/attract/sdmap', methods=['POST'])
+@api_map.route('/AttractSdmap', methods=['POST'])
 # @login_required
 # @login_required
 def attract_sdmap():
 def attract_sdmap():
     '''招商地图'''
     '''招商地图'''
     req_dict = request.get_json()
     req_dict = request.get_json()
     inid = req_dict.get("inid")  # 行业id
     inid = req_dict.get("inid")  # 行业id
+    province = req_dict.get("province")
+    city = req_dict.get("city")
     district = req_dict.get("district")
     district = req_dict.get("district")
     product = req_dict.get("product")  # 产业产品选择
     product = req_dict.get("product")  # 产业产品选择
 
 
@@ -256,12 +263,15 @@ def attract_sdmap():
             # enterprise = enterprise.filter_by(province=province, city=city, district=district).all()
             # enterprise = enterprise.filter_by(province=province, city=city, district=district).all()
         enterprise = enterprise.all()
         enterprise = enterprise.all()
         data = []
         data = []
+        if enterprise:
             for com in enterprise:
             for com in enterprise:
                 data.append({"id": com.id,
                 data.append({"id": com.id,
                              "name": com.company_name,
                              "name": com.company_name,
                              "jwd": {"lng": com.lng,  # 企业地址出的经纬度
                              "jwd": {"lng": com.lng,  # 企业地址出的经纬度
                                      "lat": com.lat}
                                      "lat": com.lat}
                              })  # 上下中游
                              })  # 上下中游
+        else:
+            return jsonify(code=RET.OK, msg="获取失败，无数据", data=data)
 
 
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)