diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java index f5c53f41..27bbbcd5 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java @@ -173,7 +173,9 @@ public class LoginServiceImpl implements LoginService { List orgs = new ArrayList<>(); if (sysCompanyEntities != null && sysCompanyEntities.size() > 0){ for (SysCompanyEntity sysCompanyEntity : sysCompanyEntities) { - orgs.add(sysCompanyEntity.getCompanyCode()); + if (sysCompanyEntity != null){ + orgs.add(sysCompanyEntity.getCompanyCode()); + } } } log.info("封装的组织机构编码{}",orgs); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java index 249887eb..b5fc2b2e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java @@ -74,15 +74,25 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl0){ @@ -412,6 +413,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl 0) { DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ); Integer orgNum = indexStatisticsService.getOrgType(gfshList); + log.info("查询到的数量为:{}",orgNum); if (orgNum != null && orgNum > 0) { + log.info("查询数量不为空"); return ResponseEntity.ok(R.ok().put("data", "1")); } return ResponseEntity.ok(R.ok().put("data", "0")); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 1962c364..bbcb9f87 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -14,6 +14,7 @@ import com.dxhy.common.util.StringHelper; import com.dxhy.common.vo.TaxOrgCode; import com.dxhy.common.vo.UserInfo; import com.dxhy.extend.entity.PullRecordReq; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -289,6 +290,16 @@ public class ExtInvoicePoolController extends AbstractController { pullRecordReq.setOrgCode(collect); pullRecordReq.setCompanyCode(""); } + if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){ + String accountPeriod = pullRecordReq.getAccountPeriod(); + if(accountPeriod != null && StringUtils.isNoneBlank(accountPeriod) && accountPeriod.contains("-")) { + String[] split = accountPeriod.split("-"); + if (split[1].startsWith("0")) { + String replace = split[1].replace("0", ""); + pullRecordReq.setAccountPeriod(split[0] + "-" + replace); + } + } + } return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); }catch (Exception e){ e.printStackTrace(); @@ -298,4 +309,14 @@ public class ExtInvoicePoolController extends AbstractController { } } + + + public static void main(String[] args) { + String str ="2022-04"; + String[] split = str.split("-"); + if(split[1].startsWith("0")){ + String replace = split[1].replace("0", ""); + System.out.println(replace); + } + } } diff --git a/pom.xml b/pom.xml index 8bfe4ada..1886e621 100644 --- a/pom.xml +++ b/pom.xml @@ -187,10 +187,7 @@ test /home/dxhy/logs/ - - - true - + @@ -223,6 +220,10 @@ std /home/dxhy/logs/ + + + true +