'完善角色权限'

light-apiengine.xml

@@ -402,7 +402,6 @@
             </column>
             <column isNull="false" name="user_id" caption="用户ID" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="role_id" caption="角色ID" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>

sqlconfig/light-apiengine-develop/sys_role.xml

@@ -1,4 +1,14 @@
 <sqlMap>
+    <sql id="get_role_no_have_menu_tree">
+        SELECT sys_menu.*, sys_role_menu.id FROM sys_menu
+        LEFT JOIN
+        sys_role_menu
+        ON sys_menu.id = sys_role_menu.menu_id
+        AND sys_role_menu.role_id = ?role_id
+        WHERE
+        sys_role_menu.id IS NULL
+        AND sys_menu.del_flag = 0
+    </sql>
     <sql id="get_role_menu_tree">
         select sys_menu.* from sys_menu, sys_role_menu
         where

sqlconfig/system_controller/system_find_user_page_select.tpl

@@ -1,13 +1,19 @@
 
 select
     sys_user.*,
-    sys_org.name org_name
+    GROUP_CONCAT(sys_role.name) user_role
 from
     sys_user
 left join
     sys_org
 on
     sys_user.org_id = sys_org.id
+left join
+    sys_user_role
+on sys_user_role.user_id = sys_user.id
+left join
+    sys_role
+on sys_role.id = sys_user_role.role_id
 where
     sys_user.del_flag = 0
 {{if ne .name ""}}
@@ -16,4 +22,5 @@ where
 {{if ne .login_id ""}}
     and sys_user.login_id like '%{{.login_id}}%'
 {{end}}
+GROUP BY sys_user.id
 LIMIT {{.rows}} OFFSET {{.offset}}