diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index ba05a359..50147736 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -461,17 +461,11 @@ public class SysUserServiceImpl extends ServiceImpl i for (SysDeptEntity sysDeptEntity : queryDept) { String orgCode = sysDeptEntity.getOrgCode(); if (StringUtils.isNotBlank(orgCode) && orgCode.contains("旧")) { - TaxOrgCode taxOrgCode = toTaxOrgCode(sysDeptEntity); - if (StringUtils.isNotEmpty(taxOrgCode.getTaxno())) { - oldTaxOrgCode.add(taxOrgCode); - } + oldTaxOrgCode.add(toTaxOrgCode(sysDeptEntity)); } else { - TaxOrgCode taxOrgCode = toTaxOrgCode(sysDeptEntity); - if (StringUtils.isNotEmpty(taxOrgCode.getTaxno())) { orgCodeList.add(toTaxOrgCode(sysDeptEntity)); } } - } orgCodeList.addAll(oldTaxOrgCode); qsStatus = queryDept.get(0).getQsStatus(); productType = queryDept.get(0).getProductType();