Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -560,7 +560,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         String currentTime = simpleDateFormat.format(System.currentTimeMillis());
         if (null != resultList) {
             int size = resultList.size();
-            importReturn.setCheckResult(currentTime+"  "+"上报成功"+String.valueOf(size)+"条记录。");
+            importReturn.setCheckResult(currentTime + "  " + "上报成功" + String.valueOf(size) + "条记录。");
             return rb.success().setData(importReturn);
         } else {
             return rb.fail().setData(importReturn);
@@ -686,7 +686,19 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         }
         HashSet<String> rowSet = new HashSet<>(rowList);
         if (rowSet.size() != rowList.size()) {
-            sb.append("序号有重复").append(";");
+            StringBuilder sbd = new StringBuilder();
+            Set<String> set = new HashSet<>();
+            Set<String> duplicateElements = new HashSet<>();
+            for (String rankNo : rowList) {
+                if (!set.add(rankNo)) {
+                    duplicateElements.add(rankNo);
+                }
+            }
+            for (String duplicateElement : duplicateElements) {
+                sbd.append(duplicateElement).append("、");
+            }
+            sbd.delete(sbd.length() - 1, sbd.length());
+            sb.append(sbd.toString() + "序号有重复").append(";");
         }
         importReturn.setImportVoList(importVoList);
         if (StringUtils.isNotBlank(sb.toString())) {