From d12e82a8cb8648fea1b421b41a209f4482c2ec8b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 07 一月 2026 18:04:42 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 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 f3692d0..dd3bd21 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
@@ -182,11 +182,11 @@
Member insert = initAddMemberModel(member,loginUserInfo);
//娴峰悍浜哄憳鏂板涓氬姟
try {
- if(dealHkUserBiz(insert)){
+ if(dealHkUserBiz(insert)){
insert.setHkStatus(Constants.ONE);
memberMapper.insert(insert);
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
- // if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ // if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
//濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
//澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
@@ -995,7 +995,7 @@
.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
.set(Member::getCode,updateMember.getCode())
- // .set(StringUtils.isNotBlank(updateMember.getCode()),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())
@@ -2479,20 +2479,38 @@
*/
@Override
public void dealJdyMemberInfo(MemberPushData data){
- if(StringUtils.isBlank(data.getUsername())
+ if(data.getDeleter()!=null){
+ //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
+ //鍐呴儴浜哄憳淇℃伅
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq( Member::getErpId,data.get_id() )
+ .eq( Member::getIsdeleted,Constants.ZERO )
+ .eq( Member::getType,Constants.TWO )
+ .last("limit 1"));
+ if(member == null){
+ //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
+ return;
+ }
+ //濡傛灉鏄凡缁忓垹闄や汉鍛�,鍒犻櫎鏈嶅姟涓績浜哄憳
+ this.deleteById(member.getId(),null);
+ return;
+ }
+
+ if(StringUtils.isBlank(data.get_id())
+ ||StringUtils.isBlank(data.getUsername())
||StringUtils.isBlank(data.getPhone())
||StringUtils.isBlank(data.getName())){
throw new BusinessException(ResponseStatus.JDY_BAD_REQUEST.getCode(),"浜哄憳淇℃伅涓嶅畬鏁达紒");
}
//鍐呴儴浜哄憳淇℃伅
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq( Member::getErpId,data.getUsername() )
+ .eq( Member::getErpId,data.get_id() )
.eq( Member::getIsdeleted,Constants.ZERO )
.eq( Member::getType,Constants.TWO )
.last("limit 1"));
if(member ==null){
//濡傛灉erpid鏈粦瀹氾紝鎸夋墜鏈哄彿鏌ヨ鐢ㄦ埛
- member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
.eq( Member::getPhone,data.getPhone() )
.eq( Member::getIsdeleted,Constants.ZERO )
.eq( Member::getType,Constants.TWO )
@@ -2500,26 +2518,15 @@
}
boolean addOrEdit = false;
if(member == null){
- //鏂板浜哄憳
- if(data.getDeleter()!=null){
- //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
- return;
- }
member = getAddOrUpdateModelFromJDY(data,true);
this.create(member);
addOrEdit=true;
}else{
- //鏇存柊浜哄憳
- if(data.getDeleter()!=null){
- //濡傛灉鏄凡缁忓垹闄や汉鍛橈紝涓嶅鐞�
- this.deleteById(member.getId(),null);
- }else{
- //鏇存柊浜哄憳淇℃伅
- Member updateMember =getAddOrUpdateModelFromJDY(data,false);
- updateMember.setId(member.getId());
- addOrEdit=true;
- this.updateById(updateMember);
- }
+ //鏇存柊浜哄憳淇℃伅
+ Member updateMember =getAddOrUpdateModelFromJDY(data,false);
+ updateMember.setId(member.getId());
+ addOrEdit=true;
+ this.updateById(updateMember);
}
if(addOrEdit && Constants.equalsInteger(member.getHeadStatus(),Constants.ONE) && member.getCompanyModel()!=null){
//濡傛灉鏄儴闂ㄤ富绠�
@@ -2549,7 +2556,8 @@
if(StringUtils.isNotBlank(data.getMaster())){
member.setHeadStatus(StringUtils.equals(data.getMaster(),"鏄�")?1:0);
}
- member.setErpId(data.getUsername());
+ member.setErpId(data.get_id());
+ member.setDdId(data.getUsername());
if(data.getDepartment()!=null){
member.setErpOrgId(data.getDepartment().getDept_no());
}
@@ -2590,7 +2598,7 @@
private String getMemberImgByJdyImg(String imgurl) {
try {
- String folder = systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ String folder = systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
FtpUtil ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
@@ -2614,10 +2622,10 @@
selectAll(SystemUser.class )
.leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
.eq(SystemUser::getDeleted,Boolean.FALSE)
- .eq(Member::getErpId,user.getUsername())
+ .eq(Member::getDdId,user.getUsername())
.last("limit 1"));
}
- return null;
+ return null;
}
@Override
--
Gitblit v1.9.3