public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-18 09:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev@feat_view_plugin

Browse Source
This commit is contained in:
fit2cloud-chenyw
2022-02-10 18:29:04 +08:00
committed by GitHub
parent 417d869d46 de83d6e78e
commit 60fa4e1cd4
9 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
View File

@@ -27,35 +27,35 @@ public class XAuthServer {
@PostMapping("/authModels")
@I18n
public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request){
public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request) {
AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
CurrentUserDto user = AuthUtils.getUser();
return sysAuthService.searchAuthModelTree(request, user.getUserId(), user.getIsAdmin());
}
@PostMapping("/authDetails")
public Map<String,List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request){
public Map<String, List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request) {
AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
return sysAuthService.searchAuthDetails(request);
}
@GetMapping("/authDetailsModel/{authType}")
@GetMapping("/authDetailsModel/{authType}/{direction}")
@I18n
public List<XpackSysAuthDetail>authDetailsModel(@PathVariable String authType){
public List<XpackSysAuthDetail> authDetailsModel(@PathVariable String authType, @PathVariable String direction) {
AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
List<XpackSysAuthDetail> authDetails = sysAuthService.searchAuthDetailsModel(authType);
if(authType.equalsIgnoreCase("dataset")){
List<XpackSysAuthDetail> authDetails = sysAuthService.searchAuthDetailsModel(authType);
if ("source".equals(direction) && authType.equalsIgnoreCase("dataset")) {
XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail();
xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission");
xpackSysAuthDetail.setPrivilegeType(20);
xpackSysAuthDetail.setPrivilegeValue(1);
authDetails.add(0,xpackSysAuthDetail);
authDetails.add(0, xpackSysAuthDetail);
}
return authDetails;
}
@PostMapping("/authChange")
public void authChange(@RequestBody XpackSysAuthRequest request){
public void authChange(@RequestBody XpackSysAuthRequest request) {
AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
CurrentUserDto user = AuthUtils.getUser();
sysAuthService.authChange(request, user.getUserId(), user.getUsername(), user.getIsAdmin());

10
backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
View File

@@ -76,7 +76,7 @@ public class DorisQueryProvider extends QueryProvider {
@Override
public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000";
return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp LIMIT 0,1000";
}
@Override
@@ -147,14 +147,6 @@ public class DorisQueryProvider extends QueryProvider {
if (customWheres != null) wheres.add(customWheres);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if ((fields.size() > 0)) {
xOrders.add(SQLObj.builder()
.orderDirection("asc")
.orderField(fields.get(0).getDataeaseName())
.orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, "0"))
.build());
st_sql.add("orders", xOrders);
}
return st_sql.render();
}