diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 3fb07ab0..c03498cd 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -186,10 +186,14 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("xfmc", xfmc); pramsMap.put("qsr", qsr); if (StringUtils.isNotBlank(rzhr)) { - String[] split = rzhr.split(","); - if (!Arrays.asList(split).contains("")) { - String[] split1 = rzhr.split(","); - pramsMap.put("rzhr", Arrays.asList(split1)); + if("admin".equals(rzhr)){ + pramsMap.put("rzhr", rzhr); + }else { + String[] split = rzhr.split(","); + if (!Arrays.asList(split).contains("")) { + String[] split1 = rzhr.split(","); + pramsMap.put("rzhr", Arrays.asList(split1)); + } } } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 053d5258..c2613178 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -433,12 +433,15 @@ and t.qs_name = #{qsr} - + and t.confirm_user in #{item} + + and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + = #{paymentDateStart} ]]>