Merge branch 'saff_update_feature' into dev

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

@@ -432,7 +432,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             if (StaffChangeStatusEnum.needChangePostionsStatus.contains(changeStatus)) {
                 //用户表更改其身份
                 AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-                if(Objects.nonNull(appUserDetail)) {
+                if(Objects.nonNull(appUserDetail) && Objects.nonNull(appUserDetail.getUserid())) {
                     //1.查询股东表 根据userid 或 手机号
                     Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
                     //离职