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

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong
2021-06-02 15:35:12 +08:00
parent 34d58277ab 5871e15387
commit 183c867452
5 changed files with 74 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java
View File

@@ -3,6 +3,7 @@ package io.dataease.controller.sys.base;
import io.dataease.base.mapper.ext.query.GridExample;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.List;
@@ -13,12 +14,20 @@ public class BaseGridRequest implements Serializable {
private List<ConditionEntity> conditions;
private List<String> orders;
public GridExample convertExample(){
GridExample gridExample = new GridExample();
if (CollectionUtils.isEmpty(conditions))return gridExample;
if (CollectionUtils.isNotEmpty(conditions)) {
GridExample.Criteria criteria = gridExample.createCriteria();
conditions.forEach(criteria::addCondtion);
}
if (CollectionUtils.isNotEmpty(orders)){
String orderByClause = String.join(", ", orders);
gridExample.setOrderByClause(orderByClause);
}
GridExample.Criteria criteria = gridExample.createCriteria();
conditions.forEach(criteria::addCondtion);
return gridExample;
}
}

16
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@@ -51,16 +51,16 @@ public class SysUserService {
public List<SysUserGridResponse> query(BaseGridRequest request) {
List<SysUser> sysUsers = sysUserMapper.selectByExample(new SysUserExample());
/* List<SysUser> sysUsers = sysUserMapper.selectByExample(new SysUserExample());
List<SysUserGridResponse> lists = sysUsers.stream().map(ele -> {
SysUserGridResponse response = new SysUserGridResponse();
BeanUtils.copyBean(response, ele);
return response;
}).collect(Collectors.toList());
}).collect(Collectors.toList());*/
GridExample gridExample = request.convertExample();
List<SysUserGridResponse> query = extSysUserMapper.query(gridExample);
List<SysUserGridResponse> lists = extSysUserMapper.query(gridExample);
lists.forEach(item -> {
for (SysUserGridResponse response : query) {
/*for (SysUserGridResponse response : query) {
if (item.getUserId().equals(response.getUserId())) {
item.setId(response.getId());
List<SysUserRole> roles = response.getRoles();
@@ -69,10 +69,10 @@ public class SysUserService {
item.setRoleIds(roleIds);
item.setDept(response.getDept());
}
}
// List<SysUserRole> roles = item.getRoles();
// List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
// item.setRoleIds(roleIds);
}*/
List<SysUserRole> roles = item.getRoles();
List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
item.setRoleIds(roleIds);
});
return lists;
}