fix20230201

apps/view_choose/choose_view.py

@@ -125,7 +125,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
         if key_words:
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''),
-                     CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
+                     CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
                      CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
                      CarrierFactory.audit_status == 1
                      )).filter(
@@ -138,7 +138,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
         else:
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''),
-                     CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
+                     CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
                      CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
                      CarrierFactory.audit_status == 1
                      ))
@@ -176,7 +176,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
         if key_words:
             carrier_obj = CarrierBuild.query.filter(
                 and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''),
-                     CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
+                     CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
                      CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''),
                      CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
                      CarrierBuild.audit_status == 1
@@ -189,7 +189,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
         else:
             carrier_obj = CarrierBuild.query.filter(
                 and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''),
-                     CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
+                     CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
                      CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''),
                      CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
                      CarrierBuild.audit_status == 1