会员项目代码

fs-service/src/main/resources/mapper/company/CompanyTagMapper.xml

@@ -66,10 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询标签列表 -->
     <select id="selectCompanyTagByList" resultType="com.fs.company.domain.CompanyTag">
-        select ct.*,fu.nickname from company_tag ct
+        select ct.* from company_tag ct
         inner join fs_user_project_tag ft on ct.tag_id =ft.tag_id
         inner join fs_user_company_user fucu on fucu.id = ft.user_company_user_id
-        inner join fs_user fu on fu.user_id =fucu.user_id
         <where>
             <if test="params.keyword != null and params.keyword.length > 0">
                 and

fs-service/src/main/resources/mapper/company/CompanyTagUserMapper.xml

@@ -132,12 +132,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectUserByMap" resultType="com.fs.company.vo.CompanyTagUserVO">
-        select fu.user_id,
-        fucu.project_id,
-        fu.nickname as userName from company_tag ct
-        inner join fs_user_project_tag ft on ct.tag_id =ft.tag_id
-        inner join fs_user_company_user fucu on fucu.id = ft.user_company_user_id
-        inner join fs_user fu on fu.user_id =fucu.user_id
+        select
+            fu.user_id,
+            fucu.project_id,
+            fu.nick_name as userName
+        from fs_user_company_user fucu
+        inner join fs_user fu on fu.user_id = fucu.user_id
+        left join fs_user_project_tag ft on fucu.id = ft.user_company_user_id
+        left join company_tag ct on fucu.id = ft.tag_id
         where fucu.company_user_id = #{params.companyUserId}
         <if test="params.tagIds != null and params.tagIds.size() > 0">
             and ft.tag_id in

fs-service/src/main/resources/mapper/company/CompanyUserChangeApplyUserMapper.xml

@@ -8,7 +8,7 @@
     <select id="getApplyUsers" resultType="com.fs.company.vo.CompanyUserChangeApplyUserVO">
         select
             fu.user_id,
-            fu.nickname as userName,
+            fu.nick_name as userName,
             fu.avatar,
             cucau.project_id
         from company_user_change_apply_user cucau

fs-service/src/main/resources/mapper/course/FsUserCompanyUserMapper.xml

@@ -154,12 +154,12 @@
     </select>
 
     <select id="selectFsUserCompanyUserListByMap" resultType="java.lang.Long">
-        select fucu.project_id from company_tag ct
-        inner join fs_user_project_tag ft on ct.tag_id =ft.tag_id
-        inner join fs_user_company_user fucu on fucu.id = ft.user_company_user_id
+        select fucu.project_id
+        from fs_user_company_user fucu
+        left join fs_user_project_tag ft on fucu.id =ft.user_company_user_id
         <where>
             <if test="param.tagIds != null and param.tagIds.size() > 0">
-                and ct.tag_id in
+                and ft.tag_id in
                 <foreach collection="param.tagIds" item="item" separator="," open="(" close=")">
                     #{item}
                 </foreach>