Merge branch 'saff_update_feature' into dev

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

@@ -428,26 +428,28 @@ 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());
-                //1.查询股东表 根据userid 或 手机号
-                Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
-                //离职
-                if (StaffChangeStatusEnum.JOB_SEPARATION.getCode() == changeStatus) {
-                    if (Objects.isNull(postionId)) {
-                        //更改为普通用户 6
-                        loginBiz.updateUserPosition(appUserDetail.getUserid(), 6);
+                if(Objects.nonNull(appUserDetail)) {
+                    //1.查询股东表 根据userid 或 手机号
+                    Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
+                    //离职
+                    if (StaffChangeStatusEnum.JOB_SEPARATION.getCode() == changeStatus) {
+                        if (Objects.isNull(postionId)) {
+                            //更改为普通用户 6
+                            loginBiz.updateUserPosition(appUserDetail.getUserid(), 6);
+                        }
                     }
-                }
-                //身份变更
-                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 (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);
+                        }
                     }
                 }
             }