Merge branches '0507' and 'release' of http://192.168.12.182/invoice/pt into 0507

dxhy-core/src/main/java/com/dxhy/core/controller/InvoiceQueryController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 发票查验模块接口类
@@ -60,6 +61,9 @@ public class InvoiceQueryController extends AbstractController {
 
         pramsMap.put("company", getUserInfo().getCompany());
         List<String> gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+        //去除里面的空字符串
+        gfshAll = gfshAll.stream().filter(str -> !str.trim().isEmpty()).collect(Collectors.toList());
+        log.info("gfshAll={}",gfshAll);
         if (gfshAll.size() > 0) {
             pramsMap.put("taxNo", gfshAll.get(0));