Merge branch 'saff_update_feature' into dev

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

@@ -473,7 +473,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         //用户表更改其身份
         if (Objects.nonNull(appUserPositionTempDTO.getUserId())) {
             AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-            if (appUserDetail != null) {
+            if (appUserDetail != null && Objects.nonNull(appUserDetail.getUserid())) {
                 Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
                 postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
                 loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);