fix20221222

apps/view_choose/fill_data.py

@@ -1711,134 +1711,155 @@ def search_carrier_build():
 
     try:
         if all([build_name, district_name, build_type]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.audit_status.in_([1, 3])))
+            #
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
                                                          CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.audit_status.in_([1, 3])))
-
+                                                         CarrierBuild.build_type.like('%{}%'.format(build_type))))
             carrier_size = carrier_obj.count()
         elif all([build_name, district_name]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.district_name == district_name,
+            #                                                  CarrierBuild.audit_status.in_([1, 3])))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.district_name == district_name,
-                                                             CarrierBuild.audit_status.in_([1, 3])))
+                                                         CarrierBuild.district_name == district_name))
             carrier_size = carrier_obj.count()
         elif all([build_name, build_type]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.audit_status.in_([1, 3])))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.audit_status.in_([1, 3])))
+                                                         CarrierBuild.build_type.like('%{}%'.format(build_type))))
             carrier_size = carrier_obj.count()
         elif all([district_name, build_type]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_id == user_id)
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.upload_people_belong == belong_unit)
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_id == user_id)
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.upload_people_belong == belong_unit)
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
+            #                                                  CarrierBuild.build_type.like('%{}%'.format(build_type)),
+            #                                                  CarrierBuild.audit_status.in_([1, 3]))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
-                                                             CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                             CarrierBuild.audit_status.in_([1, 3]))
+                                                    CarrierBuild.build_type.like('%{}%'.format(build_type)))
             carrier_size = carrier_obj.count()
         elif any([build_name, district_name, build_type]):
             if build_name:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                                CarrierBuild.upload_people_id == user_id))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                                CarrierBuild.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
-                                                                CarrierBuild.audit_status.in_([1, 3])))
-
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+                #                                                 CarrierBuild.upload_people_id == user_id))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+                #                                                 CarrierBuild.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
+                #                                                 CarrierBuild.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
+                carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_name.like('%{}%'.format(build_name)))
                 carrier_size = carrier_obj.count()
             if district_name:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
-                                                                CarrierBuild.upload_people_id == user_id))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
-                                                                CarrierBuild.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
-                                                                CarrierBuild.audit_status.in_([1, 3])))
-
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
+                #                                                 CarrierBuild.upload_people_id == user_id))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
+                #                                                 CarrierBuild.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
+                #                                                 CarrierBuild.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
+                carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name)
                 carrier_size = carrier_obj.count()
             if build_type:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                                CarrierBuild.upload_people_id == user_id))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                                CarrierBuild.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                    carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
-                                                                CarrierBuild.audit_status.in_([1, 3])))
-
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
+                #                                                 CarrierBuild.upload_people_id == user_id))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
+                #                                                 CarrierBuild.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
+                #                                                 CarrierBuild.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
+                carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_type.like('%{}%'.format(build_type)))
                 carrier_size = carrier_obj.count()
         else:  # 无参数，搜索全部
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_id == user_id)
-
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_belong == belong_unit)
-
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                carrier_obj = CarrierBuild.query.filter(CarrierBuild.audit_status.in_([1, 3]))
-
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_id == user_id)
+            #
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_belong == belong_unit)
+            #
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierBuild.query.filter(CarrierBuild.audit_status.in_([1, 3]))
+            #
+            #     carrier_size = carrier_obj.count()
+            carrier_obj = CarrierBuild.query.filter(CarrierBuild.id > 0)
             carrier_size = carrier_obj.count()
 
         build_obj_list = carrier_obj.order_by(CarrierBuild.upload_time.desc()).paginate(page, per_page).items
@@ -2090,148 +2111,174 @@ def search_carrier_factory():
     carrier_obj = ''
     try:
         if all([district_name, factory_name, is_standard]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.district_name == district_name,
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.district_name == district_name,
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.audit_status.in_([1, 3])))
+            #
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
                      CarrierFactory.district_name == district_name,
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.audit_status.in_([1, 3])))
-
+                     CarrierFactory.is_standard == is_standard))
             carrier_size = carrier_obj.count()
         elif all([factory_name, district_name]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.district_name == district_name,
-                         CarrierFactory.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.district_name == district_name,
-                         CarrierFactory.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.district_name == district_name,
+            #              CarrierFactory.audit_status.in_([1, 3])))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.district_name == district_name,
-                         CarrierFactory.audit_status.in_([1, 3])))
+                     CarrierFactory.district_name == district_name))
             carrier_size = carrier_obj.count()
         elif all([factory_name, is_standard]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_id == user_id))
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_belong == belong_unit))
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_id == user_id))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_belong == belong_unit))
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.audit_status.in_([1, 3])))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.audit_status.in_([1, 3])))
+                     CarrierFactory.is_standard == is_standard))
             carrier_size = carrier_obj.count()
         elif all([district_name, is_standard]):
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.district_name == district_name),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_id == user_id)
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierFactory.query.filter(
-                    and_(CarrierFactory.district_name == district_name),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.upload_people_belong == belong_unit)
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.district_name == district_name),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_id == user_id)
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.district_name == district_name),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.upload_people_belong == belong_unit)
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierFactory.query.filter(
+            #         and_(CarrierFactory.district_name == district_name),
+            #              CarrierFactory.is_standard == is_standard,
+            #              CarrierFactory.audit_status.in_([1, 3]))
+            #     carrier_size = carrier_obj.count()
             carrier_obj = CarrierFactory.query.filter(
                 and_(CarrierFactory.district_name == district_name),
-                         CarrierFactory.is_standard == is_standard,
-                         CarrierFactory.audit_status.in_([1, 3]))
+                CarrierFactory.is_standard == is_standard)
             carrier_size = carrier_obj.count()
         elif any([factory_name, district_name, is_standard]):
             if factory_name:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierFactory.query.filter(
-                        and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                             CarrierFactory.upload_people_id == user_id))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierFactory.query.filter(
-                        and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                             CarrierFactory.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(
+                #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+                #              CarrierFactory.upload_people_id == user_id))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(
+                #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+                #              CarrierFactory.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierFactory.query.filter(
+                #         and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
+                #              CarrierFactory.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
                 carrier_obj = CarrierFactory.query.filter(
-                        and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
-                             CarrierFactory.audit_status.in_([1, 3])))
-
+                    CarrierFactory.factory_name.like('%{}%'.format(factory_name)))
                 carrier_size = carrier_obj.count()
             if district_name:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
-                                                                   CarrierFactory.upload_people_id == user_id))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
-                                                                   CarrierFactory.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
-                                                                   CarrierFactory.audit_status.in_([1, 3])))
-
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
+                #                                                    CarrierFactory.upload_people_id == user_id))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
+                #                                                    CarrierFactory.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
+                #                                                    CarrierFactory.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
+                carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name)
                 carrier_size = carrier_obj.count()
             if is_standard:
-                if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
-                                                                   CarrierFactory.upload_people_id == user_id))
-                    carrier_size = carrier_obj.count()
-                if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
-                                                                   CarrierFactory.upload_people_belong == belong_unit))
-
-                    carrier_size = carrier_obj.count()
-                if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                    carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
-                                                                   CarrierFactory.audit_status.in_([1, 3])))
-
+                # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
+                #                                                    CarrierFactory.upload_people_id == user_id))
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
+                #                                                    CarrierFactory.upload_people_belong == belong_unit))
+                #
+                #     carrier_size = carrier_obj.count()
+                # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+                #     carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
+                #                                                    CarrierFactory.audit_status.in_([1, 3])))
+                #
+                #     carrier_size = carrier_obj.count()
+                carrier_obj = CarrierFactory.query.filter(CarrierFactory.is_standard == is_standard)
                 carrier_size = carrier_obj.count()
         else:  # 无参数，搜索全部
-            if role_id == 3:  # 如果是办事员智能看到自己提报的内容
-                carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id)
-
-                carrier_size = carrier_obj.count()
-            if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
-                carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit)
-
-                carrier_size = carrier_obj.count()
-            if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
-                carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3]))
-
+            # if role_id == 3:  # 如果是办事员智能看到自己提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id)
+            #
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 2:  # 市直部门这区县领导智能看到该部门所有办事员提报的内容
+            #     carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit)
+            #
+            #     carrier_size = carrier_obj.count()
+            # if role_id == 1:  # 局领导能看到所有审核通过和自己驳回的内容
+            #     carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3]))
+            #
+            #     carrier_size = carrier_obj.count()
+            carrier_obj = CarrierFactory.query.filter(CarrierFactory.id > 0)
             carrier_size = carrier_obj.count()
         factory_obj_list = carrier_obj.order_by(CarrierFactory.upload_time.desc()).paginate(page, per_page).items
         if factory_obj_list: