员工，股东 身份修改

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -2,7 +2,10 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailDTO;
 import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailFindDTO;
-import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.admin.vo.AppShareholderDetailVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -12,7 +15,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +28,6 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -235,12 +236,13 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                     appShareholderDetailDTO.setCompanyId(branchCompany.getId());
                     appShareholderDetailDTO.setCompanyName(branchCompany.getName());
                     appShareholderDetailDTO.setName(name);
+                    appShareholderDetailDTO.setPhone(phone);
                     appShareholderDetailDTO.setRelTime(relTime);
                     appShareholderDetailDTO.setIsQuit(0);
                     appShareholderDetailDTO.setCrtTime(System.currentTimeMillis());
                     AppShareholderDetail appShareholderDetail = new AppShareholderDetail();
                     BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
-                    mapper.insert(appShareholderDetail);
+                    mapper.insertSelective(appShareholderDetail);
                 }
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -426,9 +426,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 }
                 //身份变更
                 if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                    postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
-                    //更改为股东身份
-                    loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                      if(Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit()!=1){
+                          postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                          //更改为股东身份
+                          loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                      }
                 }
             }
         }