高龄补贴发放

src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -159,7 +159,6 @@ public class OrderController extends BaseWebController {
         }
     }
 
-
     @PostMapping(value = "/orderExport")
     @ApiOperation(httpMethod = "POST", value = "订单Excel导出")
     public void orderExport(HttpServletResponse resp,@RequestBody OrderWebInDTO orderWebInDTO){
@@ -386,7 +385,6 @@ public class OrderController extends BaseWebController {
         }
     }
 
-
     @PostMapping(value = "/transRechargeExcel")
     @ApiOperation(httpMethod = "POST", value = "账户充值Excel导出")
     @RepeatSubmit
@@ -422,4 +420,6 @@ public class OrderController extends BaseWebController {
             }
         }
     }
+
+
 }

src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -363,12 +363,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             queryWrapper.eq("d.is_delete", vo.getIsDelete());
         }
 
-        if(vo.getCityId() != null){
-            queryWrapper.eq("d.city_id", vo.getCityId());
-        }else if(TokenContext.cureWebUser().getAuthorities().contains("11") && TokenContext.cureWebUser().getAreaId() != null){
-            queryWrapper.eq("d.city_id", TokenContext.cureWebUser().getAreaId());
-        }
-
         if(vo.getCountryId() != null){
             queryWrapper.eq("d.country_id", vo.getCountryId());
         }else if(TokenContext.cureWebUser().getAuthorities().contains("12") && TokenContext.cureWebUser().getAreaId() != null){