修改认证人展示和查询

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -148,7 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
 
                     String confirmUser = pageList.get(i).getConfirmUser();
-                    if(StringUtils.isEmpty(confirmUser) && "4".equals(auditStatus)){
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(pageList.get(i).getAuthStatus())){
                         pageList.get(i).setConfirmUser("admin");
                     }
                 }

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java

@@ -609,6 +609,10 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (!"0".equals(cxrzStatus) && !"5".equals(cxrzStatus)) {
                     map.put("select", false);
                 }
+                if (StringUtils.isBlank((String) map.get("confirmUser")) && "4".equals(map.get("authStatus"))) {
+                    map.put("confirmUser","admin");
+                }
+
             }
 
         }

dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml

@@ -1110,10 +1110,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or t.confirm_user is null or t.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -145,7 +145,7 @@
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
             <choose>
                 <when test="rzhr = 'admin'">
-                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
                 </when>
                 <otherwise>
                     and t.confirm_user like CONCAT(#{rzhr},'%')
@@ -414,7 +414,7 @@
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
             <choose>
                 <when test="rzhr = 'admin'">
-                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
                 </when>
                 <otherwise>
                     and t.confirm_user like CONCAT(#{rzhr},'%')