diff --git a/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml b/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml index 27707402..7c061865 100644 --- a/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml +++ b/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml @@ -104,7 +104,7 @@ AND car.user_id = #{userId} AND res.dept_id = #{deptId} AND car.del_flag = 0 - UNION + UNION ( SELECT car.id AS "id", res.id AS "resourceId", @@ -123,8 +123,8 @@ AND car.resource_id = res.id AND car.resource_id = 8888888880000000001 AND car.user_id = #{userId} - AND res.dept_id = #{deptId} - AND car.del_flag = 0 + AND res.dept_id = 1067246875800000066 + AND car.del_flag = 0) LIMIT ${pageNum}, ${pageSize}