|
|
@@ -361,6 +361,7 @@ public class CompanyMemberController {
|
|
|
|
|
|
int affectCount = 0;
|
|
|
int existCount = 0;
|
|
|
+ List<String> existName = new ArrayList<>();
|
|
|
for(Object[] array : list){
|
|
|
String name = array[1].toString();
|
|
|
String cardType = array[2].toString();
|
|
|
@@ -378,6 +379,7 @@ public class CompanyMemberController {
|
|
|
|
|
|
if(page.size() > 0) {
|
|
|
existCount++;
|
|
|
+ existName.add(page.get(0).getName());
|
|
|
}else {
|
|
|
companyMember.setId(UUID.randomUUID().toString());
|
|
|
if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
|
|
|
@@ -407,10 +409,15 @@ public class CompanyMemberController {
|
|
|
|
|
|
if (affectCount > 0) {
|
|
|
msgResult.setResult(true);
|
|
|
- msgResult.setData("有" + existCount + "条记录已存在，成功导入" + affectCount + "条记录。");
|
|
|
+ if(existCount > 0) {
|
|
|
+ msgResult.setData("您有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
|
|
|
+ msgResult.setMessage("您有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
|
|
|
+ }else{
|
|
|
+ msgResult.setMessage("数据导入成功。");
|
|
|
+ }
|
|
|
} else {
|
|
|
msgResult.setResult(false);
|
|
|
- msgResult.setMessage("数据库添加失败");
|
|
|
+ msgResult.setMessage("数据导入失败。");
|
|
|
}
|
|
|
}
|
|
|
catch(Exception ex){
|
