wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-18 09:05:27 +08:00
parent 1b7c0c2c03 6004a99da7
commit 23a3c38620
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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