Przeglądaj źródła

Merge remote-tracking branch 'remotes/origin/video-dev' into test

syh 5 lat temu
rodzic
commit
a2654c842c

+ 5 - 26
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml

@@ -29,14 +29,7 @@
     <!-- 视频报表设计师leader展示自己所在公司的所有项目 -->
     <select id="designLeaderProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-        b.id,
-        b.project_name,
-        b.advertiser_id,
-        b.advertiser_name,
-        b.media_id,
-        b.max_bid,
-        b.advertiser_name,
-        b.responsible_name
+            distinct b.id, b.project_name,b.advertiser_id,b.advertiser_name
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
@@ -48,39 +41,25 @@
     <!-- 设计师展示所有自己的角色下制作的视频 -->
     <select id="designProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-        b.project_id,
-        b.project_name,
-        b.advertiser_id,
-        b.advertiser_name,
-        b.media_id,
-        b.maxBid,
-        b.advertiser_name,
-        b.responsible_name
+            distinct a.project_id,b.project_name,b.advertiser_id,b.advertiser_name
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
         where a.user_id = #{userId}
         and b.media_id = #{mediaId}
-        group by a.project_id
+       -- group by a.project_id
     </select>
 
     <!-- 运营和运营负责人展示所在项目视频 -->
     <select id="operationProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-        b.id,
-        b.project_name,
-        b.advertiser_id,
-        b.advertiser_name,
-        b.media_id,
-        b.max_bid,
-        b.advertiser_name,
-        b.responsible_name
+           distinct b.id,b.project_name,b.advertiser_id,b.advertiser_name
         from
         ctop_user_allocation a
         left join ctop_project b on a.project_id = b.id
         where a.user_id = #{userId}
         and b.media_id = #{mediaId}
-        group by a.project_id
+       -- group by a.project_id
     </select>
 
     <select id="getRoleCodeByUserId" resultType="string">