Commit 454844cc authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.6' into MVP1.7.6

parents ac48c452 f1c88316
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
WHEN a.PERMISSION_STATUS =1 THEN "禁用" WHEN a.PERMISSION_STATUS =1 THEN "禁用"
ELSE a.PERMISSION_STATUS END as PERMISSION_STATUS ELSE a.PERMISSION_STATUS END as PERMISSION_STATUS
FROM sys_user_permission a FROM sys_user_permission a
LEFT JOIN permission_type c on a.PERMISSION_TYPE = c.dict_id LEFT JOIN permission_type c on a.PERMISSION_TYPE = c.dict_id and c.dict_type='permission'
LEFT JOIN sys_user_info b on a.user_id = b.fd_id LEFT JOIN sys_user_info b on a.user_id = b.fd_id
<where> <where>
a.DELETE_FLAG = '1' a.DELETE_FLAG = '1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment