Merge remote-tracking branch 'origin/release' into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java

@@ -211,9 +211,11 @@ public class GroupManagementServiceImpl implements GroupManagementService {
      */
     public List<GroupTreeVO> buildGroupTree(List<TaxPlayerCodeDept> taxplayercodeDeptList) {
         //查找出level最小的节点
-//        TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get();
-//        String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId();
-        List<String> parentIdList = taxplayercodeDeptList.stream().map(DeptEntity::getParentId).collect(Collectors.toList());
+        //TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get();
+        //String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId();
+        List<String> parentIdList = taxplayercodeDeptList.stream().map(DeptEntity::getParentId).distinct().collect(Collectors.toList());
+        List<String> collect = taxplayercodeDeptList.stream().map(DeptEntity::getDeptId).distinct().collect(Collectors.toList());
+        parentIdList = parentIdList.stream().filter(t->!collect.contains(t)).collect(Collectors.toList());
         List<TreeNode<String>> nodeList = CollUtil.newArrayList();
         taxplayercodeDeptList.forEach(taxPlayerCodeDept -> {
             TreeNode<String> treeNode;

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java

@@ -105,6 +105,7 @@ public class InvoiceOpenGateRestApi {
             log.info("{}-业务处理结果:{},接口耗时为:{}", LOGGER_MESSAGE_V6, resultString, endTime - startTime);
 
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("{}-处理业务出现异常,异常原因为:{}", LOGGER_MESSAGE_V6, e.getMessage());
             PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam();
             EsOutput esOutput = new EsOutput();