Merge branch 'dev'

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -730,7 +730,7 @@
     </select>
 
     <select id="selectDeptTypeCount" resultType="java.util.Map">
-        SELECT IFNULL(COUNT(deptId),0) AS "count",
+        <!-- SELECT IFNULL(COUNT(deptId),0) AS "count",
         type
         FROM (
         SELECT DISTINCT
@@ -751,7 +751,22 @@
         WHERE
         1 = 1
         AND del_flag = 0
-        AND dept_id IS NOT NULL) temp GROUP BY type
+        AND dept_id IS NOT NULL) temp GROUP BY type -->
+        SELECT
+        IFNULL( COUNT( deptId ), 0 ) AS "count",
+        type
+        FROM
+        (
+        SELECT DISTINCT
+        sd.id AS "deptId",
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type"
+        FROM
+        sys_dept sd
+        WHERE
+        `name` != '访客部门'
+        ) temp
+        GROUP BY
+        type
     </select>
 
     <select id="selectDeptTotalCount" resultType="java.util.Map">