店内执行-城市经理看板，不返回没有城市经理的信息

src/main/resources/mapper/sales/SalesApDisplayMapper.xml

@@ -80,6 +80,7 @@
     </resultMap>
 
     <sql id = "commonQueryConditions">
+        and city_manager is not null
         <if test="salesMonth != null">
             and sales_month = #{salesMonth}
         </if>
@@ -303,7 +304,7 @@
             </where>
             group by region_name, district_name,city_manager) sp
             on ar.region_name = sp.region_name and ar.district_name = sp.district_name and
-            ar.city_manager = sp.city_manager
+            ar.city_manager = sp.city_manager order by ar.region_name,ar.district_name
         </select>
 
 
@@ -512,7 +513,7 @@
             <include refid="deptZQQuery"/>
         </where>
         group by region_name, district_name) sp
-        on ar.region_name = sp.region_name and ar.district_name = sp.district_name
+        on ar.region_name = sp.region_name and ar.district_name = sp.district_name order by ar.region_name,ar.district_name
     </select>
 
 
@@ -709,7 +710,6 @@
             <include refid="deptDQQuery"/>
         </where>
         group by region_name) sp
-        on ar.region_name = sp.region_name
-
+        on ar.region_name = sp.region_name order by ar.region_name
     </select>
 </mapper>