|
@@ -126,13 +126,13 @@ public class AuthorizationScriptUtil {
|
|
|
List<Map<String, Object>> results;
|
|
|
if (value.get("type").toString().equals("2")) {
|
|
|
results = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), """
|
|
|
- select distinct pageconfiguration.*
|
|
|
+ select distinct pageconfiguration.*,selectcolumnlist
|
|
|
from usergrouppermissions
|
|
|
right join pageconfiguration on pageconfiguration.pageconfigurationid = usergrouppermissions.pageconfigurationid
|
|
|
where usergroupid = ?""", id);
|
|
|
} else {
|
|
|
results = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), """
|
|
|
- select distinct pageconfiguration.*
|
|
|
+ select distinct pageconfiguration.*,selectcolumnlist
|
|
|
from userpermissions
|
|
|
right join pageconfiguration on pageconfiguration.pageconfigurationid = userpermissions.pageconfigurationid
|
|
|
where userid =?""", id);
|