更改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1014,6 +1014,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (ExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo != null) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已存在");
@@ -1163,6 +1166,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             List<OneExcelInfo> infos = importReturn.getInfos();
             for (OneExcelInfo info : infos) {
                 if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) {
+                    if (StringUtils.isBlank(info.getRemarks())){
+                        info.setRemarks("");
+                    }
                     ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks());
                     String uploadDate = "";
                     if (isNumber(info.getUploadDate())) {
@@ -1327,6 +1333,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (OneExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
@@ -1624,6 +1633,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             List<TwoExcelInfo> infos = importReturn.getInfos();
             for (TwoExcelInfo info : infos) {
                 if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) {
+                    if (StringUtils.isBlank(info.getRemarks())){
+                        info.setRemarks("");
+                    }
                     ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks());
                     String secondaryUploadDate = "";
                     if (isNumber(info.getSecondaryUploadDate())) {
@@ -1806,6 +1818,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (TwoExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");