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

11

Browse Source
This commit is contained in:
wangpengfei
2024-08-06 17:52:20 +08:00
parent 85967219b6
commit e471772dbc
20 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,36 +630,16 @@ public class SysUserRest {
sysStaffOrg.setManageType("3");
sysStaffOrgService.save(sysStaffOrg);
// SysRole sysRole=new SysRole();
// sysRole.setCode("");
// sysRole.setName("单位管理员");
// sysRole.setSort(0);
// sysRole.setType(1);
// sysRole.setOrgSid(sysOrg.getSid());
// sysRole.setDataRuleId("1");
// sysRoleService.save(sysRole);
// List<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid",dto.getSourceSid()));
//// List<SysMenu> sysMenus=sysMenuService.list(new QueryWrapper<SysMenu>().eq("sourceSid","d936f1ba-03c3-11ec-bf08-48452053aa33"));
// List<SysRoleAuthorize> sysRoleAuthorizes=new ArrayList<>();
// for (SysMenu sysMenu : sysMenus) {
// SysRoleAuthorize sysRoleAuthorize=new SysRoleAuthorize();
// sysRoleAuthorize.setRoleSid("002");
// sysRoleAuthorize.setMenuSid(sysMenu.getSid());
// sysRoleAuthorize.setSourceSid(dto.getSourceSid());
// sysRoleAuthorizes.add(sysRoleAuthorize);
// }
// sysRoleAuthorizeService.saveBatch(sysRoleAuthorizes);
//
// SysUserRole sysUserRole=new SysUserRole();
// sysUserRole.setRoleSid("002");
// sysUserRole.setUserSid(sysUser.getSid());
// sysUserRoleService.save(sysUserRole);
SysUser user = null;
user = sysUserService.selectByUserName(sysUser.getUserName());
user.setOrgSid(sysOrg.getSid());
SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
userInfoOneVo.setOrgSid(sysOrg.getSid());
userInfoOneVo.setOrgName(sysOrg.getName());
SysUserRole sysUserRole=sysUserRoleService.getOne(new QueryWrapper<SysUserRole>().eq("userSid",user.getSid()).eq("roleSid","002"));
sysUserRole.setOrgSid(sysOrg.getSid());
sysUserRoleService.updateById(sysUserRole);
sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken());
return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
}

2
src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java
View File

@@ -69,7 +69,7 @@ public class SysUserRoleRest {
@PostMapping("/update")
public ResultBean update(@RequestBody SysUserRoleDto dto){
ResultBean rb = ResultBean.fireFail();
sysUserRoleService.deleteByUserSid(dto.getUserSid());
sysUserRoleService.deleteByUserSid(dto.getUserSid(),"");
String roleSid = dto.getRoleSid();
if(StringUtils.isBlank(roleSid)){
return rb.success();

2
src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml
View File

@@ -137,7 +137,7 @@
<select id="selectChildernList" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
WHERE psid = #{psid} and so.isDelete!="1"
ORDER BY so.sort ASC
</select>

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

@@ -57,9 +57,9 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
String selectRoleSid(String userRoleSid);
String selectByUserSid(String sid);
List<SysRoleVo> selectsByUserSid(String sid);
List<SysRoleVo> selectsByUserSid(@Param("sid") String sid,@Param("orgSid") String orgSid);
List<String> selectByUser(String userSid);
List<String> selectByUser(@Param("userSid") String userSid,@Param("orgSid")String orgSid);
List<SysMenuRoleVoList> selectRoleList(String menuSid);

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

@@ -110,12 +110,12 @@
select sr.sid,sr.name
from sys_user_role sur
left join sys_role sr on sur.roleSid = sr.sid
where sur.userSid = #{sid} and sr.sid is not null order by dataRuleId
where sur.userSid = #{sid} and sur.orgSid=#{orgSid} and sr.sid is not null order by dataRuleId
</select>
<select id="selectByUser" resultType="java.lang.String">
select roleSid
from sys_user_role
where userSid = #{userSid}
where userSid = #{userSid} and orgSid=#{orgSid}
</select>
<select id="selectRoleList" resultType="com.yxt.portal.biz.sysuser.SysMenuRoleVoList">

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

@@ -169,12 +169,12 @@ 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<SysRoleVo> selectsByUserSid(String sid,String orgSid) {
return baseMapper.selectsByUserSid(sid,orgSid);
}
public List<String> selectByUser(String userSid) {
return baseMapper.selectByUser(userSid);
public List<String> selectByUser(String userSid,String orgSid) {
return baseMapper.selectByUser(userSid,orgSid);
}
public List<SysMenuRoleVoList> selectRoleList(String menuSid) {

1
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDetailsVo.java
View File

@@ -81,4 +81,5 @@ public class SysStaffinfoDetailsVo implements Vo {
private List<SysRoleVo> sysRoleVos;//
private String userName;
private String remarks;
private String orgSid;
}

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

@@ -485,6 +485,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
sysStaffOrg.setOrgSid(dto.getOrgSid());
sysStaffOrgService.save(sysStaffOrg);
save(sysStaffinfo3);
//添加用户信息
@@ -728,7 +729,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
* @param sid 员工信息sid
* @return
*/
public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) {
public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
//查询该人员的组织机构list
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
@@ -776,9 +777,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
//更新员工的关联的部门信息
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid,dto.getSysStaffOrg().getOrgSid());
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid,dto.getSysStaffOrg().getOrgSid1());
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
if(StringUtils.isBlank(sysStaffOrg.getOrgSid())){
sysStaffOrg.setOrgSid(dto.getOrgSid());
}
sysStaffOrgService.updateById(sysStaffOrg);
boolean isUpdate = updateById(sysStaffinfo);
if (!isUpdate) {
@@ -786,11 +790,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
//角色
sysUserRoleService.deleteByUserSid(sysUser.getSid());
sysUserRoleService.deleteByUserSid(sysUser.getSid(),dto.getOrgSid());
for (SysUserRoleDto sysUserRole : dto.getSysUserRoles()) {
SysUserRole ss = new SysUserRole();
ss.setUserSid(sysUser.getSid());
ss.setRoleSid(sysUserRole.getRoleSid());
ss.setOrgSid(dto.getOrgSid());
sysUserRoleService.save(ss);
}
List<String> orgList1 = new ArrayList<>();
@@ -852,7 +857,6 @@ 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());
sysStaffinfoDetailsVo.setSysUserRoles(list);
// SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid());

1
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDetailsVo.java
View File

@@ -15,6 +15,7 @@ public class SysStaffOrgDetailsVo implements Vo {
@ApiModelProperty("部门sid")
private String orgSid;
private String orgSid1;
@ApiModelProperty("部门名称")
private String orgName;
@ApiModelProperty("部门路径")

1
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDto.java
View File

@@ -28,6 +28,7 @@ public class SysStaffOrgDto implements Dto {
private static final long serialVersionUID = 1403491378761015027L;
@ApiModelProperty("部门sid")
private String orgSid;
private String orgSid1;
@ApiModelProperty("部门名称")
@NotBlank(message = "部门名称不能为空")
private String orgName;

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

@@ -50,7 +50,7 @@
</select>
<select id="selectByStaffByType" resultType="com.yxt.portal.biz.sysstafforg.SysStaffOrgDetailsVo">
select sso.orgSid, sso.orgName, sso.manageType, so.orgCode
select sso.orgSid, sso.orgName, sso.manageType, so.orgCode,sso.orgSid as orgSid1
from sys_staff_org sso
left join sys_organization so on sso.orgSid = so.sid
where sso.staffSid = #{sid}

2
src/main/java/com/yxt/portal/biz/systemlog/SystemLogService.java
View File

@@ -51,7 +51,7 @@ public class SystemLogService extends MybatisBaseService<SystemLogMapper, System
if (StringUtils.isNotBlank(query.getEventName())) {
qw.eq("eventName", query.getEventName());
qw.like("eventName", query.getEventName());
}
if (StringUtils.isNotBlank(query.getEventContent())) {

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

@@ -439,11 +439,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
}
}
// 设置用户的角色sids
List<String> roleSids = this.getUserRoleSids(user.getSid());
List<String> roleSids = this.getUserRoleSids(user.getSid(),user.getOrgSid());
userInfoOneVo.setRoleSids(roleSids);
String roleName = sysRoleService.selectByUserSid(user.getSid());
userInfoOneVo.setRoleName(roleName);
List<SysRoleVo> sysRoleVos=sysRoleService.selectsByUserSid(user.getSid());
List<SysRoleVo> sysRoleVos=sysRoleService.selectsByUserSid(user.getSid(),user.getOrgSid());
if(sysRoleVos.size()!=0){
userInfoOneVo.setRoleList(sysRoleVos);
userInfoOneVo.setDefaultRoleSid(sysRoleVos.get(0).getSid());
@@ -595,7 +595,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
}
}
// 设置用户的角色sids
List<String> roleSids = this.getUserRoleSids(user.getSid());
List<String> roleSids = this.getUserRoleSids(user.getSid(),"");
userInfoOneVo.setRoleSids(roleSids);
String roleName = sysRoleService.selectByUserSid(user.getSid());
userInfoOneVo.setRoleName(roleName);
@@ -693,8 +693,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
*
* @return
*/
public List<String> getUserRoleSids(String userSid) {
return sysRoleService.selectByUser(userSid);
public List<String> getUserRoleSids(String userSid,String orgSid) {
return sysRoleService.selectByUser(userSid,orgSid);
}
public SysUser fetchByUserName(String mobile) {

1
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRole.java
View File

@@ -31,4 +31,5 @@ public class SysUserRole extends BaseEntity {
@ApiModelProperty("角色sid")
private String roleSid;
private String orgSid;
}

1
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleDto.java
View File

@@ -29,4 +29,5 @@ public class SysUserRoleDto implements Dto {
@ApiModelProperty("角色sid")
private String roleSid;
private String orgSid;
}

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

@@ -37,7 +37,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
@Select("select * from sys_user_role")
List<SysUserRoleVo> selectListVo();
void deleteByUserSid(String userSid);
void deleteByUserSid(@Param("userSid") String userSid,@Param("orgSid") String orgSid);
@Delete("delete from sys_user_role where userSid=#{userSid} and roleSid=#{roleSid} ")
void delByUserSidAndRoleSid(@Param("userSid") String userSid,@Param("roleSid") String roleSid);

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

@@ -31,7 +31,7 @@
</select>
<delete id="deleteByUserSid">
delete from sys_user_role where userSid=#{params}
delete from sys_user_role where userSid=#{userSid} and orgSid=#{orgSid}
</delete>
<select id="getUserIdListByRoleSid" resultType="String">
SELECT su.id

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

@@ -88,8 +88,8 @@ public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, Sy
return vo;
}
public void deleteByUserSid(String userSid) {
baseMapper.deleteByUserSid(userSid);
public void deleteByUserSid(String userSid,String orgSid) {
baseMapper.deleteByUserSid(userSid,orgSid);
}
public void delByUserSidAndRoleSid(String userSid, String roleSid) {

1
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleVo.java
View File

@@ -30,4 +30,5 @@ public class SysUserRoleVo implements Vo {
@ApiModelProperty("角色sid")
private String roleSid;
private String name;
private String orgSid;
}

4
src/main/resources/application-pro.yml
View File

@@ -22,8 +22,8 @@ spring:
timeout: 0 # 连接超时时间（毫秒）
image:
upload:
path: D:/webapps/lipinka/yythmall-ui/upload/
path: D:/webapps/share-store/ui/share-store/upload/
url:
prefix: https://supervise.yxtsoft.com/lpk/upload/
prefix: https:/wms.yxtsoft.com/file/upload
import:
filePath: D:/yxt-supervise-gf/upload/