调整传入数据

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -507,7 +507,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         }
 
         for (UserProjectDTO u : users) {
-            userCompanyUserService.changeRelationship(u.getUserId(), u.getProjectId(), toUser.getCompanyId(), toUser.getCompanyId());
+            userCompanyUserService.changeRelationship(u.getUserId(), u.getProjectId(), toUser.getCompanyId(), toUser.getUserId());
         }
 //       fsUserMapper.batchUpdateUserCompanyUser(userIds, companyUserId, companyId);
 //        // 修改中间表

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -1183,7 +1183,7 @@
             LEFT JOIN fs_user_course_count fcc ON FIND_IN_SET( fcpd.period_id, fcc.course_ids ) > 0
             LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
             left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
-            WHERE 1=1
+            WHERE 1=1 and fcpd.del_flag =0 and fpd.del_flag =0
             AND FIND_IN_SET(#{companyId}, fpd.company_id)
             <if test="userId != null and userId != 0 ">
                 AND ucu.company_user_id = #{userId}
@@ -1206,7 +1206,7 @@
             LEFT JOIN fs_user_course_count fcc ON FIND_IN_SET( fcpd.period_id, fcc.course_ids ) > 0
             LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
             left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
-            WHERE 1=1
+            WHERE 1=1 and fcpd.del_flag =0 and fpd.del_flag =0
             AND FIND_IN_SET(#{companyId}, fpd.company_id)
             <if test="userId != null and userId != 0 ">
                 AND ucu.company_user_id = #{userId}