Merge branch 'dev'

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -119,23 +119,6 @@
         AND su.dept_id != ''
         AND su.dept_id IS NOT NULL
         GROUP BY tda.attr_value
-        UNION
-        SELECT
-        COUNT( taa.apply_flag ) AS 'count',
-        'jcss' AS 'type'
-        FROM
-        t_ability_application taa,
-        sys_dept sd,
-        sys_user su
-        WHERE
-        1 = 1
-        AND taa.user_id = su.id
-        AND su.dept_id = sd.id
-        AND taa.camera_list != ''
-        AND taa.camera_list IS NOT NULL
-        GROUP BY
-        sd.id
-
         ) temp2
     </select>