ariesy 增加throw

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("admin".equals(rzhr)){
-            if (!Arrays.asList(split).contains("")) {
+                pramsMap.put("rzhr", rzhr);
-                String[] split1 = rzhr.split(",");
+            }else {
-                pramsMap.put("rzhr", Arrays.asList(split1));
+                String[] split = rzhr.split(",");
+                if (!Arrays.asList(split).contains("")) {
+                    String[] split1 = rzhr.split(",");
+                    pramsMap.put("rzhr", Arrays.asList(split1));
+                }
             }
         }
 

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -433,12 +433,15 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null'">
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
             and t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="rzhr == 'admin'">
+            and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
             <![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]>
         </if>