wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-31 10:06:27 +08:00
parent 48abe30209 80a0aa8325
commit 7884d2dcc4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -225,6 +225,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
wrapper.in(true, "del_flag", 0, 5); wrapper.in(true, "del_flag", 0, 5);
} }
} }
if (params.containsKey("infoList")) {
// TODO
}
wrapper.orderByAsc("del_flag").orderByDesc("create_date"); wrapper.orderByAsc("del_flag").orderByDesc("create_date");
return wrapper; return wrapper;
} }

2
renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
View File

@ -168,7 +168,7 @@ public class SysUserController {
@ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType = "String") @ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType = "String")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysUserDTO> list = sysUserService.list(params); List<SysUserDTO> list = sysUserService.list(params);
params.put("export", true);
ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class); ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
} }

5
renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
View File

@ -97,7 +97,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
@Override @Override
public List<SysUserDTO> list(Map<String, Object> params) { public List<SysUserDTO> list(Map<String, Object> params) {
//普通管理员，只能查询所属部门及子部门的数据 // 普通管理员，只能查询所属部门及子部门的数据
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) { if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {
params.put("deptIdList", sysDeptService.getSubDeptIdList(user.getDeptId())); params.put("deptIdList", sysDeptService.getSubDeptIdList(user.getDeptId()));
@ -106,6 +106,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
if (roleDTO != null) { if (roleDTO != null) {
params.put("role_id", roleDTO.getId()); params.put("role_id", roleDTO.getId());
} }
if (params.containsKey("export")) { // 导出特殊处理
params.remove("role_id");
}
List<SysUserEntity> entityList = baseDao.getList(params); List<SysUserEntity> entityList = baseDao.getList(params);
return ConvertUtils.sourceToTarget(entityList, SysUserDTO.class); return ConvertUtils.sourceToTarget(entityList, SysUserDTO.class);