productDev/dmvisit.git

			@@ -929,11 +929,11 @@
			.set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
			.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
			.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
			.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.set(Member::getCode,updateMember.getCode())
			// .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
			.set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
			.set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
			.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
			.eq(Member::getId,updateMember.getId()));
			dealTrainTIme(updateMember,1,loginUserInfo);
			cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
			@@ -2048,7 +2048,7 @@
			ExcelImporter ie = null;
			List<MemberImport> dataList =null;
			try {
			ie = new ExcelImporter(file,2,0);
			ie = new ExcelImporter(file,1,0);
			dataList = ie.getDataList(MemberImport.class,null);
			} catch (Exception e) {
			e.printStackTrace();
			@@ -2118,6 +2118,10 @@
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息导入失败，请稍后重试！");
			}
			}

			public static void main(String[] args) {
			System.out.println(PhoneUtil.isPhone("18156047603"));
			}
			private Member checkModelParam(MemberImport model, List<Member> newList
			,int index
			,LoginUserInfo loginUserInfo
			@@ -2185,7 +2189,7 @@
			private Company findCompanyFromList(String companyName, List<Company> companyList) {
			if(companyList !=null){
			for(Company company : companyList){
			if(StringUtils.equals(companyName,company.getName())){
			if(StringUtils.equals(companyName,company.getCompanyNamePath())){
			return company;
			}
			}