From d32227561023d5347141678102e55f6ca5add619 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 12:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 0a776a5..6a2eaf2 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
@@ -909,6 +909,10 @@
                     .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( 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);

--
Gitblit v1.9.3