qin 10 달 전
부모
커밋
3af0b1effd

+ 2 - 0
src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -196,6 +196,7 @@ public class OrderController extends BaseWebController {
                 String templateLocation = "classpath:excel/goldSend.xlsx";
                 String filename = "";
                 Map<String, Object> data = Maps.newHashMap();
+                orgConstrainService.fillOrgParams(page);
                 List<GoldSendExcelDTO> list = orderService.excelGoldSendList(page);
                 ExcelUtils2.easyDownload(templateLocation,data , list, filename, resp);
             }else{
@@ -223,6 +224,7 @@ public class OrderController extends BaseWebController {
                 String templateLocation = "classpath:excel/goldSendBank.xlsx";
                 String filename = "";
                 Map<String, Object> data = Maps.newHashMap();
+                orgConstrainService.fillOrgParams(page);
                 List<GoldSendBankExcelDTO> list = orderService.excelGoldSendBankList(page);
                 ExcelUtils2.easyDownload(templateLocation,data , list, filename, resp);
             }else{

+ 1 - 7
src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -351,7 +351,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             queryWrapper.eq("d.id_number", vo.getIdNumber());
         }
         if(StringUtils.isNotEmpty(vo.getName())){
-            queryWrapper.like("d.name", vo.getName());
+            queryWrapper.eq("d.name", vo.getName());
         }
         if(vo.getGoldType() != null){
             queryWrapper.eq("d.gold_type", vo.getGoldType());
@@ -365,20 +365,14 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 
         if(vo.getCountryId() != null){
             queryWrapper.eq("d.country_id", vo.getCountryId());
-        }else if(TokenContext.cureWebUser().getAuthorities().contains("12") && TokenContext.cureWebUser().getAreaId() != null){
-            queryWrapper.eq("d.country_id", TokenContext.cureWebUser().getAreaId());
         }
 
         if(vo.getStreetId() != null){
             queryWrapper.eq("d.street_id", vo.getStreetId());
-        }else if(TokenContext.cureWebUser().getAuthorities().contains("10") && TokenContext.cureWebUser().getAreaId() != null){
-            queryWrapper.eq("d.street_id", TokenContext.cureWebUser().getAreaId());
         }
 
         if(vo.getCommunityId() != null){
             queryWrapper.eq("d.community_id", vo.getCommunityId());
-        }else if(TokenContext.cureWebUser().getAuthorities().contains("9") && TokenContext.cureWebUser().getAreaId() != null){
-            queryWrapper.eq("d.community_id", TokenContext.cureWebUser().getAreaId());
         }
         return queryWrapper;
     }