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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-13 17:11:47 +08:00
parent 2ffe4948cf 35d08fe63f
commit 6f3096556b
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,8 @@ import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup; import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup; import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup; import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.audit_team.dto.SysAuditTeamDTO;
import io.renren.modules.audit_team.service.SysAuditTeamService;
import io.renren.modules.security.password.PasswordUtils; import io.renren.modules.security.password.PasswordUtils;
import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.security.user.UserDetail; import io.renren.modules.security.user.UserDetail;
@ -36,6 +38,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 用户管理 * 用户管理
@ -56,6 +59,8 @@ public class SysUserController {
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@Autowired @Autowired
private SysRoleService sysRoleService; private SysRoleService sysRoleService;
@Autowired
private SysAuditTeamService sysAuditTeamService;
@Value("${big_date.assignee_role_name}") @Value("${big_date.assignee_role_name}")
private String roleName0; // 具备审批的角色名称(普通) private String roleName0; // 具备审批的角色名称(普通)
@ -272,6 +277,13 @@ public class SysUserController {
} }
add(Long.parseLong(defaultAssigneeRoleId)); add(Long.parseLong(defaultAssigneeRoleId));
}}; }};
return new Result<PageData<Map>>().ok(new PageData<>(sysUserService.getUserByRoleList(roleId, (int) curPage, (int) limit), sysUserService.getUserByRoleListCount(roleId))); List<Map> temp = sysUserService.getUserByRoleList(roleId, (int) curPage, (int) limit);
temp = temp.stream().map(index -> {
List<SysAuditTeamDTO> sysAuditTeamDTOList = sysAuditTeamService.selectByMemberOne(index.get("id").toString());
index.put("inAuditTeam", !sysAuditTeamDTOList.isEmpty());
index.put("auditTeamName", sysAuditTeamDTOList.stream().findFirst().isPresent() ? sysAuditTeamDTOList.stream().findFirst().get().getName() : "");
return index;
}).collect(Collectors.toList());
return new Result<PageData<Map>>().ok(new PageData<>(temp, sysUserService.getUserByRoleListCount(roleId)));
} }
} }

3
renren-admin/src/main/resources/mapper/sys/SysUserDao.xml
View File

@ -200,6 +200,7 @@
<select id="getUserByRoleList" resultType="java.util.Map"> <select id="getUserByRoleList" resultType="java.util.Map">
SELECT SELECT
DISTINCT
sys_user.id, sys_user.id,
sys_user.username, sys_user.username,
sys_user.real_name, sys_user.real_name,
@ -222,7 +223,7 @@
</select> </select>
<select id="getUserByRoleListCount" resultType="java.lang.Long"> <select id="getUserByRoleListCount" resultType="java.lang.Long">
SELECT SELECT
COUNT( sys_user.id ) COUNT(DISTINCT sys_user.id )
FROM FROM
sys_role_user sys_role_user
LEFT JOIN sys_user ON sys_user.id = sys_role_user.user_id LEFT JOIN sys_user ON sys_user.id = sys_role_user.user_id