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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-09 09:01:38 +08:00
parent ec4a84b581 983b01af36
commit 286df76ec3
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,8 @@
dept.name AS "deptName", dept.name AS "deptName",
COUNT(car.id) AS "count" COUNT(car.id) AS "count"
FROM FROM
(select del_flag, user_id, json_extract(note1, '$[0].idtCameraChannel') as id, TRIM(BOTH '"' FROM json_extract(note1, '$[0].managementUnitName')) as dept_name, json_extract(note1, '$[0].channelName') as name (select del_flag, user_id, json_extract(note1, '$[0].idtCameraChannel') as id, TRIM(BOTH '"' FROM
json_extract(note1, '$[0].managementUnitName')) as dept_name, json_extract(note1, '$[0].channelName') as name
from tb_resource_car where note1 IS NOT NULL) car, from tb_resource_car where note1 IS NOT NULL) car,
sys_dept dept sys_dept dept
WHERE car.user_id = #{userId} WHERE car.user_id = #{userId}
@ -162,7 +163,9 @@
car.note1, car.note1,
car.create_date AS "time" car.create_date AS "time"
FROM FROM
(select del_flag, user_id, note1, create_date, resource_id, json_extract(note1, '$[0].idtCameraChannel') as id, TRIM(BOTH '"' FROM json_extract(note1, '$[0].managementUnitName')) as dept_name, json_extract(note1, '$[0].channelName') as name (select del_flag, user_id, note1, create_date, resource_id, json_extract(note1, '$[0].idtCameraChannel') as id,
TRIM(BOTH '"' FROM json_extract(note1, '$[0].managementUnitName')) as dept_name, json_extract(note1,
'$[0].channelName') as name
from tb_resource_car where note1 IS NOT NULL) car from tb_resource_car where note1 IS NOT NULL) car
left join sys_dept dept on car.dept_name=dept.name left join sys_dept dept on car.dept_name=dept.name
WHERE 1 = 1 WHERE 1 = 1