ariesy 已认证的数据认证证人为空时，设置成damin

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -51,7 +51,6 @@ import java.util.stream.Collectors;
 public class BaseInvoiceController extends AbstractController {
     /**
      * 认证发票查询service
-     *
      */
     @Resource
     private BaseRzFpxxService baseRzFpxxService;
@@ -190,13 +189,8 @@ public class BaseInvoiceController extends AbstractController {
             String[] split = rzhr.split(",");
             if (!Arrays.asList(split).contains("")) {
                 String[] split1 = rzhr.split(",");
-                if(split1.length == 1){
-                    pramsMap.put("rzhr", rzhr);
-                }else{
                 pramsMap.put("rzhr", Arrays.asList(split1));
             }
-
-            }
         }
 
         if (!StringUtils.isBlank(invoiceNo)) {
@@ -389,8 +383,7 @@ public class BaseInvoiceController extends AbstractController {
     /**
      * 撤销认证
      *
-     * @param map
-     *            请求参数 id逗号分隔
+     * @param map 请求参数 id逗号分隔
      * @return 返回结果
      */
     @PostMapping("/rzzhcx/cxrz")
@@ -417,7 +410,6 @@ public class BaseInvoiceController extends AbstractController {
     }
 
     /**
-     *
      * 扫码勾选录入查询
      */
     @PostMapping("/smgx/smgxcx")
@@ -533,8 +525,6 @@ public class BaseInvoiceController extends AbstractController {
         }
 
 
-
-
         Map<String, Object> pramsMap = new HashMap<>(32);
 
         pramsMap.put("companyCode", companyCode);
@@ -995,7 +985,6 @@ public class BaseInvoiceController extends AbstractController {
         }
 
 
-
         try {
             return ResponseEntity
                     .ok(R.ok().put("data", baseInvoiceManualCheckService.inTellingCheck(pramsMap)));
@@ -1182,7 +1171,7 @@ public class BaseInvoiceController extends AbstractController {
 
     /**
      * 扫码，手工，导入勾选操做入口
-     *
+     * <p>
      * 0-手工勾选 1-扫码勾选 2-导入勾选 3- 智能勾选 4-手工认证 5-扫码认证 6-导入认证
      *
      * @return 返回结果
@@ -1226,8 +1215,7 @@ public class BaseInvoiceController extends AbstractController {
     /**
      * 已勾选发票待确认列表
      *
-     * @param map
-     *            请求参数
+     * @param map 请求参数
      * @return 返回结果
      */
     @PostMapping("/ygxfp/jgxfpcx")
@@ -1319,8 +1307,7 @@ public class BaseInvoiceController extends AbstractController {
     /**
      * 撤销已经勾选的发票
      *
-     * @param map
-     *            请求参数
+     * @param map 请求参数
      * @return 返回结果
      */
     @PostMapping("/gxfp/cxgx")
@@ -1349,8 +1336,7 @@ public class BaseInvoiceController extends AbstractController {
     /**
      * 一键提交
      *
-     * @param map
-     *            请求参数
+     * @param map 请求参数
      * @return 返回结果
      */
     @PostMapping("/gxfp/tjrz")

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

@@ -156,10 +156,17 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr == 'admin'">
-            and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+            and (t.confirm_user in
+            <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            or t.confirm_user is null or t.confirm_user = '')
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            and t.confirm_user in
+            <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if
                 test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
@@ -434,10 +441,17 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr == 'admin'">
-            and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+            and (t.confirm_user in
+            <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            or t.confirm_user is null or t.confirm_user = '')
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            and t.confirm_user in
+            <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
             <![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]>