Explorar o código

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

zhaoxian %!s(int64=4) %!d(string=hai) anos
pai
achega
70796dd250

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -330,6 +330,7 @@ public class ProjectController {
                 projectMemberService.removeByMap(map);
                 ProjectMember member = new ProjectMember();
                 member.setProjectId(id);
+                member.setProjectName(project.getProjectName());
                 member.setUserId(userId);
                 member.setUserName(userName);
                 String roleCode = sysRoleService.getRoleCodeByUserId(userId);

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

@@ -112,7 +112,10 @@
     <select id="queryProjectMemberByUserId" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
         distinct b.project_id as projectId,
-        b.project_name as projectName,
+         (
+         select project_name  from ctop_project
+         where id = b.project_id
+        )as projectName,
         a.advertiser_id as advertiserId,
         (
         select name from ctop_advertiser where id = a.advertiser_id

+ 7 - 7
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -33,14 +33,14 @@
     </select>
 
     <select id="getUserIdListByProjectId" resultType="com.alibaba.fastjson.JSONObject">
-    SELECT t2.user_id as 'userId',
-    t2.account_id as 'accountId',
-    t2.user_name  as 'userName'
-    from ctop_user_allocation t1  LEFT JOIN
-    ctop_kuaishou_advertiser_base_info t2
+   SELECT t1.user_id as 'userId',
+    t1.account_id as 'accountId',
+    t1.user_name  as 'userName'
+    from  ctop_kuaishou_advertiser_base_info t1  LEFT JOIN
+    ctop_user_allocation  t2
     ON t1.account_id = t2.account_id
-    WHERE t1.project_id = #{projectId}
-    GROUP BY t2.user_id
+    WHERE t2.project_id = #{projectId}
+    GROUP BY t1.user_id;
     </select>