diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 46487c82..9c90ed95 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -230,7 +230,7 @@ public class ExcelService implements IExcelService { */ private void readMember(XSSFSheet wbsSheet, XSSFSheet memberSheet, int memberStart, int memberEnd, SysProject sysProject, List proRoles, List proMembers) throws Exception { - Integer seq=new Integer(0); + int seq= 0; //添加奖惩干系人角色(一级角色) ProRole stakeholderRole = new ProRole(); stakeholderRole.setName(WebConstant.ROLE_NAME.MoneyStakeholder.value); @@ -575,7 +575,7 @@ public class ExcelService implements IExcelService { proMembers.add(member); // //创建者依据project的creatorId判断,不需要添加成员 } else { - throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE.addMsg(memberSheet.getSheetName(),(i+1),memberCell)); + throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE.addMsg(memberSheet.getSheetName(),(i+1))); } } } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 828fc4ef..47091d08 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -34,7 +34,7 @@ public enum CodeEnum { WBS_NOT_PHONE(19,"手机号为空",true), WBS_PHONE_ERROR(19,"手机号格式错误",true), WBS_STAKEHOLDER_PHONE(20,"奖惩干系人和手机号不匹配",true), - WBS_REPEAT_MEMBER_PHONE(21,"成员已存在",true), + WBS_REPEAT_MEMBER_PHONE(21,"成员名或手机号与其他人重复",true), WBS_NOT_FIRST_ROLE(22,"系统角色名称错误",true), WBS_REPEAT_ROLE_NAME(23,"角色名称重复",true), WSB_NOT_MEMBER(24,"未找到对应成员", true),