open_platform/ss-common-user
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

用户

Browse Source
This commit is contained in:
wangpengfei
2024-08-12 14:37:33 +08:00
parent 09b5b0c5af
commit 3615befe34
6 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
View File

@@ -858,7 +858,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
// SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sysUser.getStaffSid(), orgSid, type);
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid());
SysOrganization s =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",orgSid1));
s.setOrgSidPath(s.getOrgSidPath()+"/");
String b[]=s.getOrgSidPath().split("/");
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid(),b[0]);
sysStaffinfoDetailsVo.setSysUserRoles(list);
// SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid());
if(sysStaffOrgDetailsVo != null){

18
src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml
View File

@@ -9,19 +9,18 @@
user.accountType,
user.createTime,
user.isEnable,
c.sid as departmentSid,
(
SELECT GROUP_CONCAT(org.name)
FROM sys_staff_org staffOrg
LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
WHERE staffOrg.staffSid = user.staffSid
) departmentName,
-- (
-- SELECT GROUP_CONCAT(org.sid)
-- FROM sys_staff_org staffOrg
-- LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-- WHERE staffOrg.staffSid = user.staffSid
-- ) departmentSid,
(
SELECT GROUP_CONCAT(org.sid)
FROM sys_staff_org staffOrg
LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
WHERE staffOrg.staffSid = user.staffSid and staffOrg.manageType!=2
) departmentSid,
(
SELECT GROUP_CONCAT(post.name)
FROM sys_staff_post staffPost
@@ -41,8 +40,9 @@
SELECT GROUP_CONCAT(role.name)
FROM sys_user_role user_role
LEFT JOIN sys_role role ON role.sid = user_role.roleSid
WHERE user_role.userSid = USER.sid
) roleName
WHERE user_role.userSid = USER.sid and user_role.orgSid=SUBSTRING_INDEX(c.orgSidPath,'/',1)
) roleName,
c.sid as orgSid
-- dict.dictValue userType,
FROM sys_user USER
LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid

5
src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
View File

@@ -164,7 +164,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
IPage<SysUserVo> pagging = baseMapper.selectPageVo(page, qw, deptName, userName);
List<SysUserVo> records = pagging.getRecords();
for (SysUserVo record : records) {
record.setSysRoleVos(sysUserRoleService.selByUserSid(record.getSid()));
SysOrganization d =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",record.getOrgSid()));
d.setOrgSidPath(d.getOrgSidPath()+"/");
String b[]=d.getOrgSidPath().split("/");
record.setSysRoleVos(sysUserRoleService.selByUserSid(record.getSid(),b[0]));
for (SysUserRoleVo sysRoleVo : record.getSysRoleVos()) {
if(StringUtils.isBlank(record.getRoles())){
record.setRoles(sysRoleVo.getName());

2
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java
View File

@@ -43,7 +43,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
void delByUserSidAndRoleSid(@Param("userSid") String userSid,@Param("roleSid") String roleSid);
List<SysUserRoleVo> selectByUserSid(@Param("userSid")String userSid,@Param("orgSid")String orgSid,@Param("sourceSid")String sourceSid);
List<SysUserRoleVo> selByUserSid(@Param("userSid")String userSid);
List<SysUserRoleVo> selByUserSid(@Param("userSid")String userSid,@Param("orgSid")String orgSid);
@Select("SELECT roleSid FROM sys_user_role WHERE userSid=#{userSid}")

3
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml
View File

@@ -28,6 +28,9 @@
FROM sys_user_role a
left join sys_role b on b.sid =a.roleSid
WHERE a.userSid = #{userSid}
<if test="orgSid !=null and orgSid!=''">
and a.orgSid=#{orgSid}
</if>
</select>
<delete id="deleteByUserSid">

4
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleService.java
View File

@@ -99,8 +99,8 @@ public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, Sy
public List<SysUserRoleVo> selectByUserSid(String userSid,String orgSid,String sourceSid) {
return baseMapper.selectByUserSid(userSid,orgSid,sourceSid);
}
public List<SysUserRoleVo> selByUserSid(String userSid) {
return baseMapper.selByUserSid(userSid);
public List<SysUserRoleVo> selByUserSid(String userSid,String orgSid ) {
return baseMapper.selByUserSid(userSid,orgSid);
}
/*public void updateUserRole(SysUserRoleDto dto) {
//sysUserRoleService.deleteByUserSid(dto.getUserSid());