Merge branch 'saff_update_feature' into dev

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

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

@@ -105,10 +105,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
-            int ids = addUserFindId(userPositionTemp).getId();
-            appUserPositionTempDTO.setId(ids);
+            insertSelective(userPositionTemp);
             //记录表插入
-            //  appUserPositionTempDTO.setId();
             appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         } else {
             updateSelectiveById(userPositionTemp);
@@ -196,7 +194,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public Map<String, Object> importUserPostion(List<String[]> userPostionData, Integer operatorId) {
+    public Map<String, Object> importUserPostion(List<String[]> userPostionData) {
         Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
@@ -442,12 +440,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 }
                 //身份变更
                 if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                    //不是离职状态下
-                    if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
-                        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);
+                      }
                 }
             }
         }