Browse Source

外呼明细接口新增多部门查询

anderx 1 year ago
parent
commit
51e8ca91f3

+ 6 - 0
src/main/java/com/goafanti/common/mapper/AdminCallDayMapper.xml

@@ -55,6 +55,12 @@
                     #{teamId}
                 </foreach>
             </if>
+            <if test="teamIds != null">
+            and team_id in
+            <foreach collection="teamIds" item="teamId" open="(" close=")" separator=",">
+                #{teamId}
+            </foreach>
+        </if>
             <if test="quantityType !=null">
                 <if test="quantityType==1">
                     and valid_sum &lt; 10

+ 5 - 5
src/main/java/com/goafanti/common/mapper/SalesTeamMapper.xml

@@ -27,11 +27,11 @@
     </select>
 
     <!--查询指定行数据-->
-    <select id="findSalesTeamList" resultMap="SalesTeamMap">
-        select
-        <include refid="SalesTeamAllSql"/>
-
-        from sales_team
+    <select id="findSalesTeamList" resultType="com.goafanti.admin.bo.SalesTeamBo">
+        select a.id, a.name, a.aid, a.lvl, a.dep_id depId, a.super_id superId, a.status, a.create_time createTime,
+        b.name adminName,c.name depName,d.name superName
+        from sales_team a left join admin b on a.aid=b.id left join department c on a.dep_id=c.id
+        left join sales_team d on a.super_id=d.id
         <where>
             <if test="id != null">
                 and id = #{id}

+ 14 - 8
src/main/java/com/goafanti/customer/service/impl/AdminCallDayServiceImpl.java

@@ -30,16 +30,22 @@ public class AdminCallDayServiceImpl extends BaseMybatisDao<AdminCallDayMapper>
         if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)&& !TokenManager.hasRole(AFTConstants.CALL_MANAGER)){
             String adminId = TokenManager.getAdminId();
             List<SalesTeam> salesTeams = salesTeamMapper.queryByAid(adminId);
-            List<Integer> collect = salesTeams.stream().map(SalesTeam::getId).collect(Collectors.toList());
-            set.addAll(collect);
-            for (Integer i : collect) {
-                List<Integer> integers = salesTeamMapper.queryByAncestors(i);
-                set.addAll(integers);
+            if (!salesTeams.isEmpty()){
+                List<Integer> collect = salesTeams.stream().map(SalesTeam::getId).collect(Collectors.toList());
+                set.addAll(collect);
+                for (Integer i : collect) {
+                    List<Integer> integers = salesTeamMapper.queryByAncestors(i);
+                    set.addAll(integers);
+                }
+                //查看的权限
+                map.put("teamIds",set);
             }
         }
-        List<Integer> integers = salesTeamMapper.queryByAncestors(Integer.valueOf(in.getTeamId()));
-        pushTeams(map,set ,integers);
-
+        if (in.getTeamId()!=null){
+            List<Integer> integers = salesTeamMapper.queryByAncestors(Integer.valueOf(in.getTeamId()));
+            integers.add(Integer.valueOf(in.getTeamId()));
+            map.put("teamIdList",integers);
+        }
         return findPage("findAdminCallDayList", "findAdminCallDayCount", map, in.getPageNo(), in.getPageSize());
     }