diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java index 96f76733..f3d5796d 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.bms.entity.bo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsSupplier; @@ -114,10 +115,18 @@ public class BmsSupplierExcelBo { } bo.setIsSupplier(bmsSupplier.getSupplierFlag()); bo.setAffiliatedCompany(bmsSupplier.getBelong()); - bo.setMainHeadName(bmsSupplier.getUserName().replaceAll(",",";")); - bo.setMainHeadCode(bmsSupplier.getUserCode().replaceAll(",",";")); - bo.setMinorHeadNames(bmsSupplier.getOtherUserNames().replaceAll(",",";")); - bo.setMinorHeadCodes(bmsSupplier.getOtherUserCodes().replaceAll(",",";")); + if(StringUtils.hasText(bmsSupplier.getUserName())) { + bo.setMainHeadName(bmsSupplier.getUserName().replaceAll(",", ";")); + } + if(StringUtils.hasText(bmsSupplier.getUserCode())) { + bo.setMainHeadCode(bmsSupplier.getUserCode().replaceAll(",", ";")); + } + if(StringUtils.hasText(bmsSupplier.getOtherUserNames())) { + bo.setMinorHeadNames(bmsSupplier.getOtherUserNames().replaceAll(",", ";")); + } + if(StringUtils.hasText(bmsSupplier.if(StringUtils.hasText(bmsSupplier.getUserCode())) {())) { + bo.setMinorHeadCodes(bmsSupplier.getOtherUserCodes().replaceAll(",", ";")); + } bo.setIsExpendableExpense(bmsSupplier.getCostFlag()); bo.setCloseAccountDate(bmsSupplier.getStopFlagDate()); bo.setCloseAccountStatus(bmsSupplier.getStopFlag());