Merge branch 'master' into docker_package

renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml

@@ -84,7 +84,7 @@
 
     <select id="selectInfrastructureCarGroupByDept" resultType="java.util.Map">
         SELECT
-        IFNULL(dept.id, -1) AS "deptId",
+        IFNULL(ANY_VALUE(dept.id), -1) AS "deptId",
         car.dept_name AS "deptName",
         COUNT(car.id) AS "count"
         FROM
@@ -94,6 +94,7 @@
         left join sys_dept dept on car.dept_name=dept.name
         WHERE car.user_id = #{userId}
         AND car.del_flag = 0
+          AND car.dept_name IS NOT NULL
         <if test="name != null and name != ''">
             AND car.name LIKE CONCAT('%',#{name},'%')
         </if>