修改mapper文件

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -290,7 +290,7 @@ public class EmailMaintainController extends AbstractController  {
             String jsonString = Base64.encode(json.toJSONString());
             return ResponseEntity.ok(R.ok().put("data",jsonString));
         }else{
-            return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据"));
+            return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据"));
         }
     }
 

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

@@ -466,6 +466,8 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
         ResultData resultData = new ResultData<>();
         JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(company, menuId);
         resultData.putTabulateMenu(tabulateMenu);
+        resultData.setNumberSerial(false);
+        resultData.setTotal(returnList.size());
 
         return resultData.setDataList(returnList).toJsonBase();
     }

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

@@ -346,6 +346,10 @@
         <if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
             AND create_date between #{cjksyf} and #{cjjsyf}
         </if>
+        AND gf_tax_no in
+        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         <if test="kpksrq != null and kpksrq!= '' and kpjsrq != null and kpjsrq != ''">
             AND invoice_date between #{kpksrq} and #{kpjsrq}
         </if>