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-13 22:03:14 +08:00
parent 096470457e de5d3738d7
commit 339dd090fc
2 changed files with 1341 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1329
config/db/V6.8__init_system_data.sql Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -167,12 +167,15 @@
'应用资源' AS "type"
FROM
t_ability_application taa
,tb_data_resource tdr
, tb_data_resource tdr
, sys_user su
WHERE
taa.resource_id = tdr.id
AND tdr.del_flag = 0
AND tdr.type = '应用资源'
AND taa.user_id = su.id
AND su.dept_id != ''
AND su.dept_id IS NOT NULL
UNION
SELECT
@ -180,14 +183,19 @@
tda.attr_value AS "type"
FROM
t_ability_application taa
,tb_data_resource tdr
,tb_data_attr tda
, tb_data_resource tdr
, tb_data_attr tda
, sys_user su
WHERE
taa.resource_id = tdr.id
AND tdr.id = tda.data_resource_id
AND tdr.del_flag = 0
AND tda.del_flag = 0
AND tdr.type = '组件服务'
AND tda.attr_type = '组件类型'
AND taa.user_id = su.id
AND su.dept_id != ''
AND su.dept_id IS NOT NULL
GROUP BY tda.attr_value
</select>