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

7/12

Browse Source
This commit is contained in:
wangpengfei
2024-07-12 17:59:36 +08:00
parent a78a9eaf0a
commit f490dcb4fb
7 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
View File

@@ -461,8 +461,7 @@ public class SysUserRest {
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid",dto.getUserSid()));
sysUser.setOrgSid(dto.getOrgSid());
SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(sysUser);
userInfoOneVo.setOrgSid(dto.getOrgSid());
userInfoOneVo.setOrgName(userInfoOneVo.getOrganizationName());
sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken());
return new ResultBean<>().success().setData(userInfoOneVo);
}

1
src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java
View File

@@ -56,6 +56,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
String selectRoleSid(String userRoleSid);
String selectByUserSid(String sid);
List<SysRoleVo> selectsByUserSid(String sid);
List<String> selectByUser(String userSid);

11
src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
View File

@@ -27,7 +27,7 @@
<select id="selectListAllVo" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT *
FROM sys_role
FROM sys_role sr
<where>
${ew.sqlSegment}
</where>
@@ -36,7 +36,7 @@
SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
FROM sys_role role
LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
AND userRole.userSid = #{param1} and isEnable="1"
AND userRole.userSid = #{param1} and role.isEnable="1"
</select>
<select id="fetchByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
@@ -96,7 +96,12 @@
left join sys_role sr on sur.roleSid = sr.sid
where sur.userSid = #{sid}
</select>
<select id="selectsByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
select sr.sid,sr.name
from sys_user_role sur
left join sys_role sr on sur.roleSid = sr.sid
where sur.userSid = #{sid} order by dataRuleId
</select>
<select id="selectByUser" resultType="java.lang.String">
select roleSid
from sys_user_role

3
src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java
View File

@@ -162,6 +162,9 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
public String selectByUserSid(String sid) {
return baseMapper.selectByUserSid(sid);
}
public List<SysRoleVo> selectsByUserSid(String sid) {
return baseMapper.selectsByUserSid(sid);
}
public List<String> selectByUser(String userSid) {
return baseMapper.selectByUser(userSid);

3
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
View File

@@ -53,7 +53,8 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
@Select("select * from sys_staff_org where staffSid=#{staffSid}")
List<SysStaffOrgVo> getSysStaffOrgListByStaffSid(@Param("staffSid") String staffSid);
@Select("select * from sys_staff_org where staffSid=#{staffSid} and manageType = '3'")
// @Select("select * from sys_staff_org where staffSid=#{staffSid} and manageType = '3'")
@Select("select * from sys_staff_org where staffSid=#{staffSid}")
List<SysStaffOrgVo> getSysStaffOrgListByStaff(@Param("staffSid") String staffSid);
/**

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

@@ -8,6 +8,7 @@ import com.yxt.portal.biz.sms.SmsFeign;
import com.yxt.portal.biz.sysmenu.SysMenu;
//import com.yxt.user.biz.sysmobilemenu.SysMobileMenu;
import com.yxt.portal.biz.sysorganization.SysOrganization;
import com.yxt.portal.biz.sysrole.SysRoleVo;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo;
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo;
import com.yxt.portal.biz.sysstafforg.SysStaffOrg;
@@ -25,6 +26,7 @@ import com.yxt.portal.biz.sysuser.app.OrgList;
import com.yxt.portal.biz.sysuser.wx.WxHomePageVo;
import com.yxt.portal.biz.sysuser.wx.WxMySysUserInfoVo;
import com.yxt.portal.biz.sysuser.wx.WxSysUserVo;
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrg;
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService;
import com.yxt.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.common.base.config.RedisUtil;
@@ -404,11 +406,15 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
userInfoOneVo.setPostName(staffPostDetailsVo.getName());
}
if (orgVoList.size() > 0) {
// userInfoOneVo.setOrgList(list);
//类型为员工的组织机构信息
SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
userInfoOneVo.setDefaultDeptName(sysStaffOrgVo.getOrgName());
userInfoOneVo.setDefaultDeptSid(sysStaffOrgVo.getOrgSid());
SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid());
if (sysOrganizationOne != null) {
String psid = sysOrganizationOne.getPsid();
if(StringUtils.isNotNull(psid)){
@@ -420,18 +426,23 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
}
userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
// userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
// userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
List<String> split = Arrays.asList(sysOrganizationOne.getOrgSidPath().split("/"));
SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",split.get(0)));
userInfoOneVo.setOrgName(sysOrganization.getName());
userInfoOneVo.setOrgSid(split.get(0));
// userInfoOneVo.setOrgNamePath(sysOrganizationOne.getOrgNamePath());
userInfoOneVo.setOrgSidPath(sysOrganizationOne.getOrgSidPath());
//根据orgSidPath查询分公司sid=====
//根据用户sid查询用户是否设置了默认的组织机构
// SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid());
// if (sysUserDefaultOrg == null) {
//// if (sysUserDefaultOrg == null) {
// String orgNamePath = "";
// String defaultDeptName = "";
// String defaultDeptSid = "";
// userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
// if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
// List<String> split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/"));
// userInfoOneVo.setDefaultOrgPath(sysOrganizationOne.getOrgSidPath());
// if (StringUtils.isNotBlank(sysOrganizationOne.getOrgSidPath())) {
// List<String> split = Arrays.asList(sysOrganizationOne.getOrgSidPath().split("/"));
// if (split.size() > 1) {
// //获取本级sid获取本级部门信息
// SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2));
@@ -446,7 +457,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
// defaultDeptSid = sysOrganization.getSid();
// }
// }
// userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
//// userInfoOneVo.setDefaultOrgPathName(sysOrganizationOne.getOrgNamePath());
// userInfoOneVo.setDefaultOrgPathName(orgNamePath);
// userInfoOneVo.setDefaultDeptName(defaultDeptName);
// userInfoOneVo.setDefaultDeptSid(defaultDeptSid);
@@ -489,13 +500,22 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
userInfoOneVo.setRoleSids(roleSids);
String roleName = sysRoleService.selectByUserSid(user.getSid());
userInfoOneVo.setRoleName(roleName);
List<SysRoleVo> sysRoleVos=sysRoleService.selectsByUserSid(user.getSid());
if(sysRoleVos.size()!=0){
userInfoOneVo.setRoleList(sysRoleVos);
userInfoOneVo.setDefaultRoleSid(sysRoleVos.get(0).getSid());
userInfoOneVo.setDefaultRoleName(sysRoleVos.get(0).getName());
}
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
List<OrgList> orgList = new ArrayList<>();
if (sysStaffOrgVos.size() > 0) {
for (SysStaffOrgVo vv : sysStaffOrgVos) {
OrgList orgList1 = new OrgList();
// orgList1.setOrgPath(vv.getOrgSidPath());
// orgList1.setOrgName(vv.getOrgNamePath());
orgList1.setOrgName(vv.getOrgName());
orgList1.setDeptName(vv.getOrgName());
orgList1.setDeptSid(vv.getOrgSid());
String orgName = "";
String deptName = "";
String deptSid = "";

6
src/main/java/com/yxt/portal/biz/sysuser/SysUserVo.java
View File

@@ -66,7 +66,10 @@ public class SysUserVo implements Vo {
private String isAdmin;
@ApiModelProperty("角色名称")
private String roleName;
@ApiModelProperty("默认的角色sid")
private String defaultRoleSid;
@ApiModelProperty("默认的角色名")
private String defaultRoleName;
@ApiModelProperty("关联的人员sid")
private String staffSid;
@@ -89,6 +92,7 @@ public class SysUserVo implements Vo {
private String token;
@ApiModelProperty(value = "角色sids")
private List<String> roleSids = new ArrayList<>();
List<SysRoleVo> roleList=new ArrayList<>();
private List<OrgList> orgList = new ArrayList<>();
@ApiModelProperty("默认的组织机构sid全路径")