身份变更

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

@@ -3,12 +3,17 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  * @author zuoyihang
  * @version 1.0
  * @description
  * @data 2019/12/21 19:52
  */
+@Transactional(rollbackFor = Exception.class)
+@Service
 public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, AppShareholderDetail> {
 
     public Integer findShareholderByUserIdOrPhone(Integer userId, String phone) {

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

@@ -118,7 +118,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         //用户表更改其身份
         AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
         if (appUserDetail != null) {
-            loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
+            loginBiz.updateUserPosition(appUserDetail.getUserid(), appUserPositionTempDTO.getPositionId());
         }
         return ObjectRestResponse.succ();
     }
@@ -411,26 +411,23 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             appUserPositionTempDTO.setPositionId(6);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
-        //用户表更改其身份
-        AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-        if (appUserDetail != null) {
-            loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
-        }
         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.getId(), 6);
+                    loginBiz.updateUserPosition(appUserDetail.getUserid(), 6);
                 }
             }
             //身份变更
             if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
                 postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
                 //更改为股东身份
-                loginBiz.updateUserPosition(appUserDetail.getId(), postionId);
+                loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
             }
         }
 
@@ -454,7 +451,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (appUserDetail != null) {
             Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
             postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
-            loginBiz.updateUserPosition(appUserDetail.getId(), postionId);
+            loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
         }
         return ObjectRestResponse.succ();
     }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -15,12 +15,17 @@
 	</resultMap>
 
 	<select id="selectShareHolderByUserIdOrPhone" resultType="java.lang.Integer">
-		select  `postion_id` from `app_shareholder_detail` where 1=1
-		<if test="userId != null">
-		     or `user_id`#{userId}
-		</if>
-		<if test="phone != null and phone != ''">
-			or `phone`= #{phone}
-		</if>
+		select  min(`postion_id`) from `app_shareholder_detail` where `is_quit`=0
+		<choose>
+			<when test="userId != null and (phone == null or phone != '')">
+				and `user_id`=#{userId}
+			</when>
+			<when test="phone != null and phone != '' and userId == null">
+				and `phone`=#{phone}
+			</when>
+			<otherwise>
+				and `user_id`=#{userId}
+			</otherwise>
+		</choose>
 	</select>
 </mapper>
\ No newline at end of file