fix20230111

apps/view_atlas/view.py

@@ -292,7 +292,8 @@ def industry_chain():
         #     return jsonify(code=RET.OK, msg="获取成功", data=data)
         #     return jsonify(code=RET.OK, msg="获取成功", data=data)
 
 
         # 行业使用名
         # 行业使用名
-        industryName = Industry.query.filter_by(nid=inid).first().oname
+        # industryName = Industry.query.filter_by(nid=inid).first().oname
+        industryName = IndustryChain.query.filter_by(id=inid).first().industry_name
         ptp = neo4j_dict()
         ptp = neo4j_dict()
         if industryName in ptp:
         if industryName in ptp:
             industryName = ptp[industryName]
             industryName = ptp[industryName]
@@ -330,7 +331,8 @@ def industry_resource():
     if not all([inid, industry_level, select_flag, page, perpage]):
     if not all([inid, industry_level, select_flag, page, perpage]):
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
 
-    name = Industry.query.filter_by(nid=inid).first().oname
+    # name = Industry.query.filter_by(nid=inid).first().oname
+    name = IndustryChain.query.filter_by(id=inid).first().industry_name
 
 
     if select_flag == 1:  # 高等院校
     if select_flag == 1:  # 高等院校
         try:
         try:
@@ -526,7 +528,9 @@ def industry_zaiti():
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
 
     # if inid:
     # if inid:
-    name = Industry.query.filter_by(nid=inid).first().oname  # 获取导航对应的真名
+    # name = Industry.query.filter_by(nid=inid).first().oname  # 获取导航对应的真名
+    name = IndustryChain.query.filter_by(id=inid).first().industry_name
+
     try:
     try:
         data = get_data(name, industry_level, select_flag, page, perpage)
         data = get_data(name, industry_level, select_flag, page, perpage)
         return jsonify(code=RET.OK, msg="数据查询成功", data=data)
         return jsonify(code=RET.OK, msg="数据查询成功", data=data)
@@ -1073,13 +1077,16 @@ def industry_collect():
     try:
     try:
         if collect == "2":  # 未关注，我要关注
         if collect == "2":  # 未关注，我要关注
             user = User.query.get(user_id)
             user = User.query.get(user_id)
-            indu = Industry.query.filter_by(nid=_id).first()
+            # indu = Industry.query.filter_by(nid=_id).first()
+            indu = IndustryChain.query.filter_by(id=_id).first()
+
             user.industry.append(indu)
             user.industry.append(indu)
             db.session.commit()
             db.session.commit()
             return jsonify(code=RET.OK, msg="收藏成功", collect="1")
             return jsonify(code=RET.OK, msg="收藏成功", collect="1")
         elif collect == "1":  # 已关注，我要取关
         elif collect == "1":  # 已关注，我要取关
             user = User.query.get(user_id)
             user = User.query.get(user_id)
-            indu = Industry.query.filter_by(nid=_id).first()
+            # indu = Industry.query.filter_by(nid=_id).first()
+            indu = IndustryChain.query.filter_by(id=_id).first()
             user.industry.remove(indu)
             user.industry.remove(indu)
             db.session.commit()
             db.session.commit()
             return jsonify(code=RET.OK, msg="取消成功", collect="2")
             return jsonify(code=RET.OK, msg="取消成功", collect="2")

apps/view_choose/view.py

 from sqlalchemy import func, desc, or_, text, and_
 from sqlalchemy import func, desc, or_, text, and_
 from flask import current_app, request, jsonify
 from flask import current_app, request, jsonify
-from apps.models import Induzone, Industry, CompanyIndustryPoint, User
+from apps.models import *
 from apps.utils.response_code import RET
 from apps.utils.response_code import RET
 from apps.view_choose import api_address
 from apps.view_choose import api_address
 
 
@@ -99,7 +99,8 @@ def advice():
                     Induzone.tax < tax if tax else text('')
                     Induzone.tax < tax if tax else text('')
                 )
                 )
         if industry_id:
         if industry_id:
-            indu = Industry.query.filter_by(nid=industry_id).first()
+            # indu = Industry.query.filter_by(nid=industry_id).first()
+            indu = IndustryChain.query.filter_by(id=industry_id).first()
             if not indu:
             if not indu:
                 return jsonify(code=RET.DATAERR, msg="参数错误")
                 return jsonify(code=RET.DATAERR, msg="参数错误")
             # 获取产业名称
             # 获取产业名称
@@ -145,7 +146,7 @@ def advice():
 @api_address.route("/DownList", methods=["GET"])
 @api_address.route("/DownList", methods=["GET"])
 def downlist():  # 一级二级行业分类
 def downlist():  # 一级二级行业分类
     try:
     try:
-        industry = Industry.query.filter_by(statu=1).all()
+        industry = IndustryChain.query.filter_by(statu=1).all()
         data = [{
         data = [{
             "name": i.name,
             "name": i.name,
             "id": i.nid,
             "id": i.nid,