From b33f2e78ffd4fd401698b84a33dc3c293793c62f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 16:22:33 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 811936b..e9173a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -57,6 +57,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -929,11 +930,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 +2049,7 @@
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
- ie = new ExcelImporter(file,2,0);
+ ie = new ExcelImporter(file,1,0, CellType.STRING); // 纭繚鍗曞厓鏍肩被鍨嬩负瀛楃涓�);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -2118,6 +2119,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 +2190,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;
}
}
--
Gitblit v1.9.3