交接功能修复

src/main/java/com/qs/serve/modules/oms/entity/bo/SysFlowUserBo.java

@@ -0,0 +1,31 @@
+package com.qs.serve.modules.oms.entity.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/10/27
+ */
+@Data
+public class SysFlowUserBo {
+
+    /**
+     * 离职用户
+     */
+    String userId;
+
+    /**
+     * 继承人
+     */
+    String extendUserId;
+
+    /**
+     * 业务类型：
+     * 1-费用及核销
+     * 2-政策
+     * 3-订单
+     */
+    Integer targetTypeNum;
+}

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -20,6 +20,7 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
 import com.qs.serve.modules.oms.entity.bo.SysFlowCancelBo;
 import com.qs.serve.modules.oms.entity.bo.SysFlowLeaveBo;
+import com.qs.serve.modules.oms.entity.bo.SysFlowUserBo;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.bo.*;
@@ -658,5 +659,18 @@ public class SysUserController {
     }
 
 
+    /**
+     * 人员业务交接
+     * @param param
+     */
+    @PostMapping("/extendTranUser")
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> extendTranData(SysFlowUserBo param){
+        if(param.getTargetTypeNum().equals(1)){
+            sysUserFlowApplication.tranCostApplyAndVerification(param.getUserId(),param.getUserId());
+        }
+        return R.ok();
+    }
+
 }
 

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.oms.entity.bo.SysFlowCancelBo;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
@@ -36,6 +37,9 @@ public class SysUserFlowApplication {
      */
     @Transactional(rollbackFor = Exception.class)
     public void tranCostApplyAndVerification(String sourUserId,String targetUserId){
+        if(!StringUtils.hasText(targetUserId)){
+            return;
+        }
         SysUser sysUser = sysUserMapper.selectById(targetUserId);
         tbsCostApplyMapper.updateCostExtUser(sourUserId,sysUser);
         verificationMapper.updateCostExtUser(sourUserId,sysUser);

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -295,7 +295,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     //客户交接人
                     String cusUserId = userLeave.getCusUserId();
                     if(StringUtils.hasText(cusUserId)){
-                        SysUser cusUser = super.baseMapper.selectById(userId);
+                        SysUser cusUser = super.baseMapper.selectById(cusUserId);
                         supplierApplicationService.removeUserOfSupplierList(leaveUser,cusUser);
                     }
                     //角色交接人

src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java

@@ -24,7 +24,7 @@ public interface VtbVerificationMapper extends BaseMapper<VtbVerification> {
     @Update(
             "update vtb_verification " +
                     " set ext_user_id = #{obj.id},ext_user_id=#{obj.code},ext_user_name=#{obj.name}" +
-                    " where charge_State!=0 and (user_id = #{userId} or ext_user_id = #{userId}) and del_flag=0"
+                    " where verification_state!=0 and (user_id = #{userId} or ext_user_id = #{userId}) and del_flag=0"
     )
     int updateCostExtUser(@Param("userId") String userId, @Param("obj") SysUser sysUser);