分公司和营业部分开

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -69,8 +69,8 @@
     </select>
     </select>
 
 
     <select id="statisticsOpportunity" resultType="com.yd.dal.entity.agms.dashboard.StatisticsOpportunityInfo">
     <select id="statisticsOpportunity" resultType="com.yd.dal.entity.agms.dashboard.StatisticsOpportunityInfo">
-        select if(b.branch_name is null,'暂无公司',b.branch_name) branchName,
-        if(s.name is null ,'暂无团队',s.name) subordinateName,
+        select  if(b.branch_name is null,'',b.branch_name) branchName,
+                if(s.name is null ,'',s.name) subordinateName,
         <choose>
         <choose>
             <when test="time.equalsIgnoreCase('D')">
             <when test="time.equalsIgnoreCase('D')">
                 sum(case when to_days(a.created_at)=to_days(now()) then 1 else 0 end) opportunityNum,
                 sum(case when to_days(a.created_at)=to_days(now()) then 1 else 0 end) opportunityNum,
@@ -118,6 +118,7 @@
         and a.id = tt.leads_assigned_id)
         and a.id = tt.leads_assigned_id)
         <choose>
         <choose>
             <when test="type.equalsIgnoreCase('B')">
             <when test="type.equalsIgnoreCase('B')">
+                and p.insurer_branch_id is not null
                 group by p.insurer_branch_id
                 group by p.insurer_branch_id
             </when>
             </when>
             <when test="type.equalsIgnoreCase('T')">
             <when test="type.equalsIgnoreCase('T')">