dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(user):查询bug fix

Browse Source
This commit is contained in:
junjie 2021-05-27 14:45:20 +08:00
parent 1537c8d2f5
commit fac1cdf5d6
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java
View File

@ -9,6 +9,5 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ExtSysUserMapper {
List<SysUserGridResponse> query(GridExample example);
}

6
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
View File

@ -44,11 +44,5 @@
<if test="orderByClause == null">
order by u.update_time desc
</if>
</select>
</mapper>

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

@ -50,12 +50,28 @@ public class SysUserService {
public List<SysUserGridResponse> query(BaseGridRequest request) {
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());
GridExample gridExample = request.convertExample();
List<SysUserGridResponse> lists = extSysUserMapper.query(gridExample);
List<SysUserGridResponse> query = extSysUserMapper.query(gridExample);
lists.forEach(item -> {
List<SysUserRole> roles = item.getRoles();
List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
item.setRoleIds(roleIds);
for (SysUserGridResponse response : query) {
if (item.getUserId().equals(response.getUserId())) {
item.setId(response.getId());
List<SysUserRole> roles = response.getRoles();
item.setRoles(roles);
List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
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);
});
return lists;
}