Merge remote-tracking branch 'origin/dev' into dev

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

@@ -16,6 +16,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Transactional
 @Service("appUserPositionChangeRecordBiz")
@@ -43,26 +44,26 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
+        if (Objects.nonNull(userPositionTemp.getIsQuit()) && !(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 
         //状态1：职位变动
-        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+        if (Objects.nonNull(userPositionTemp.getJobId()) && !(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
             appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
             appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
             appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
             findUserJobName(appUserPositionChangeRecord);
         }
         //状态2：身份变动
-        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+        if (Objects.nonNull(userPositionTemp.getPositionId()) && !(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
             appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
             appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
             appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
             findUserPositionName(appUserPositionChangeRecord);
         }
         //状态3：公司变动调整
-        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+        if (Objects.nonNull(userPositionTemp.getCompanyId()) && !(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
             appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
             appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
             appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
@@ -76,7 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
         appUserPositionChangeRecord.setOperatorId(operatorId);
-        mapper.insert(appUserPositionChangeRecord);
+        mapper.insertSelective(appUserPositionChangeRecord);
     }
 
     /**