身份变更

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

@@ -112,14 +112,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             updateSelectiveById(userPositionTemp);
         }
         if (userId != 0) {
+             //更改用户身份信息
             detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId());
         }
-
-        //用户表更改其身份
-        AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-        if (appUserDetail != null) {
-            loginBiz.updateUserPosition(appUserDetail.getUserid(), appUserPositionTempDTO.getPositionId());
-        }
         return ObjectRestResponse.succ();
     }
 
@@ -411,23 +406,25 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             appUserPositionTempDTO.setPositionId(6);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
-        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(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 (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
+                    postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                    //更改为股东身份
+                    loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
                 }
-            }
-            //身份变更
-            if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
-                //更改为股东身份
-                loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
             }
         }
 
@@ -447,11 +444,13 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setUpdTime(System.currentTimeMillis());
         appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
         //用户表更改其身份
-        AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-        if (appUserDetail != null) {
-            Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
-            postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
-            loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+        if (Objects.nonNull(appUserPositionTempDTO.getUserId())) {
+            AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
+            if (appUserDetail != null) {
+                Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
+                postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
+                loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+            }
         }
         return ObjectRestResponse.succ();
     }