fix20230406

apps/view_xiaocx/view.py

@@ -853,11 +853,12 @@ def collection_list():
     user_obj = verify_token(token)
     user_obj = verify_token(token)
     if not user_obj:
     if not user_obj:
         return jsonify(code=RET.SESSIONERR, msg='User not logged in')
         return jsonify(code=RET.SESSIONERR, msg='User not logged in')
-
+    user_id = user_obj.id
     try:
     try:
         data = []
         data = []
         if name == 'land':
         if name == 'land':
-            obj_list = user_obj.carrier_land
+            obj_list = UserLand.query.filter(UserLand.user_id == user_id).order_by(UserLand.create_time.desc()).all()
+            # obj_list = user_obj.carrier_land
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "name": obj.land_name,
                 "name": obj.land_name,
@@ -869,7 +870,8 @@ def collection_list():
                 "lat": obj.lat,
                 "lat": obj.lat,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'build':
         elif name == 'build':
-            obj_list = user_obj.carrier_build
+            obj_list = UserBuild.query.filter(UserBuild.user_id == user_id).order_by(UserBuild.create_time.desc()).all()
+            # obj_list = user_obj.carrier_build
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "name": obj.build_name,
                 "name": obj.build_name,
@@ -881,7 +883,8 @@ def collection_list():
                 "lat": obj.lat,
                 "lat": obj.lat,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'factory':
         elif name == 'factory':
-            obj_list = user_obj.carrier_factory
+            obj_list = UserFactory.query.filter(UserFactory.user_id == user_id).order_by(UserFactory.create_time.desc()).all()
+            # obj_list = user_obj.carrier_factory
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "name": obj.factory_name,
                 "name": obj.factory_name,
@@ -893,7 +896,8 @@ def collection_list():
                 "lat": obj.lat,
                 "lat": obj.lat,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'zone':
         elif name == 'zone':
-            obj_list = user_obj.industry_zone
+            obj_list = UserZone.query.filter(UserZone.user_id == user_id).order_by(UserZone.create_time.desc()).all()
+            # obj_list = user_obj.industry_zone
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "name": obj.name,
                 "name": obj.name,
@@ -905,7 +909,8 @@ def collection_list():
                 "lat": obj.lat,
                 "lat": obj.lat,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'project':
         elif name == 'project':
-            obj_list = user_obj.project
+            obj_list = UserProject.query.filter(UserProject.user_id == user_id).order_by(UserProject.create_time.desc()).all()
+            # obj_list = user_obj.project
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "name": obj.name,
                 "name": obj.name,
@@ -916,7 +921,8 @@ def collection_list():
                 # "lat": obj.lat,
                 # "lat": obj.lat,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'company':
         elif name == 'company':
-            obj_list = user_obj.company
+            obj_list = UserCompany.query.filter(UserCompany.user_id == user_id).order_by(UserCompany.create_time.desc()).all()
+            # obj_list = user_obj.company
             data = [{
             data = [{
                 "id": obj.id,
                 "id": obj.id,
                 "company_name": obj.company_name,
                 "company_name": obj.company_name,
@@ -924,6 +930,7 @@ def collection_list():
                 "company_industry": obj.company_industry,
                 "company_industry": obj.company_industry,
                 "lng": obj.lng,
                 "lng": obj.lng,
                 "lat": obj.lat,
                 "lat": obj.lat,
+                "create_time": obj.create_time,
             } for obj in obj_list]
             } for obj in obj_list]
         elif name == 'policy':
         elif name == 'policy':
             obj_list = user_obj.industry_policy
             obj_list = user_obj.industry_policy