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,8 +105,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
-            insertSelective(userPositionTemp);
+            userPositionTemp.setIsQuit(0);
+            int ids = addUserFindId(userPositionTemp).getId();
+            appUserPositionTempDTO.setId(ids);
             //记录表插入
+            //  appUserPositionTempDTO.setId();
             appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         } else {
             updateSelectiveById(userPositionTemp);
@@ -194,7 +197,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, Integer operatorId) {
         Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
@@ -275,13 +278,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     appUserPositionTemp.setId(id);
                     updateSelectiveById(appUserPositionTemp);
                 } else {
-                  //  insertSelective(appUserPositionTemp);
+                    //  insertSelective(appUserPositionTemp);
                     AppUserPositionTemp appUserPositionTempNew = new AppUserPositionTemp();
                     BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempNew);
                     appUserPositionTempNew = addUserFindId(appUserPositionTemp);
                     //记录表插入
                     appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
                 }
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -439,12 +443,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);
+                    }
                 }
             }
         }