Merge branch 'saff_update_feature'

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

@@ -428,10 +428,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             appUserPositionTempDTO.setPositionId(6);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
-        if (Objects.nonNull(appUserPositionTempDTO.getUserId())) {
+        if (Objects.nonNull(appUserPositionTempDTO.getUserId()) && !Objects.equals(0,appUserPositionTempDTO.getUserId())) {
             if (StaffChangeStatusEnum.needChangePostionsStatus.contains(changeStatus)) {
                 //用户表更改其身份
                 AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
+                if(Objects.nonNull(appUserDetail) && Objects.nonNull(appUserDetail.getUserid())) {
                     //1.查询股东表 根据userid 或 手机号
                     Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
                     //离职
@@ -452,6 +453,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     }
                 }
             }
+        }
 
         return ObjectRestResponse.succ();
     }
@@ -471,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);