From 5666119fb842219e9fe200431541463152221012 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Sun, 24 Apr 2022 10:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98-=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectRelatedPersonnelServiceImpl.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 29e4c2602..1f93a28ea 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -418,9 +418,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue());
 				exportParams=new ExportParams(title , "Exporter:" + sysUser.getUsername(), title);
 			}
-			projectRelatedPersonnel.setLawEngineerName("ning.chen xinhui.wei");
-			projectRelatedPersonnel.setEngineeringInterfacePersonName("ning.chen xinhui.wei");
-			projectRelatedPersonnel.setCertificationEngineerName("ning.chen xinhui.wei");
+			projectRelatedPersonnel.setLawEngineerName("ning.chen,xinhui.wei");
+			projectRelatedPersonnel.setEngineeringInterfacePersonName("ning.chen,xinhui.wei");
+			projectRelatedPersonnel.setCertificationEngineerName("ning.chen,xinhui.wei");
 			projectRelatedPersonnel.setRemark("xxxxx");
 			if(projectRelatedPersonnel != null) {
 				records.add(projectRelatedPersonnel);
@@ -428,7 +428,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
 			mv.addObject(NormalExcelConstants.CLASS, clazz);//!!!!这里设置中英切换
 			mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-			mv.addObject(NormalExcelConstants.DATA_LIST, projectRelatedPersonnel);
+			mv.addObject(NormalExcelConstants.DATA_LIST,records);
 			return mv;
 		}catch(Exception e){
 			throw new JeroBootException("出现异常,请重新登录");
@@ -538,7 +538,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						if(CutEnum.CN.getValue().equals(cut)) {
 							throw new JeroBootException("导入的法规工程师姓名有误,请检查第" + row + "行");
 						}else{
-							throw new JeroBootException("The imported law engineer  is wrong.Please check line " + row );
+							throw new JeroBootException("The imported law engineer is wrong.Please check line " + row );
 						}
 					}
 				}
@@ -643,7 +643,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				}
 			}
 			projectRelatedPersonnel.setProjectId(projectId);
-
+			row++;
 		}
 		return records;
 	}