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-15 10:49:42 +08:00
parent d8826fef04
commit 24c27a5436
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,13 +488,24 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysOrg.setManagerSid(sysStaffinfo3.getSid()); sysOrg.setManagerSid(sysStaffinfo3.getSid());
sysOrg.setManagerName(dto.getName()); sysOrg.setManagerName(dto.getName());
sysOrganizationService.updateById(sysOrg); sysOrganizationService.updateById(sysOrg);
SysStaffOrg sysStaffOrg = new SysStaffOrg();
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
return rb.setMsg("所在部门不能为空");
}
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType("3");
sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());
sysStaffOrgService.save(sysStaffOrg);
save(sysStaffinfo3);
}else if(dto.getSysStaffOrg().getManageType().equals("3")){ }else if(dto.getSysStaffOrg().getManageType().equals("3")){
SysStaffOrg sysStaffOrg = new SysStaffOrg(); SysStaffOrg sysStaffOrg = new SysStaffOrg();
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) { if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
return rb.setMsg("所在部门不能为空"); return rb.setMsg("所在部门不能为空");
} }
sysStaffOrgDto.fillEntity(sysStaffOrg); sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid()); sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType()); sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid()); sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());

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

@@ -707,6 +707,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
public void delBySid(String sid) { public void delBySid(String sid) {
SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("sid",sid)); SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("sid",sid));
SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("managerType",sysUser.getStaffSid()));
sysOrganization.setManagerSid("");
sysOrganization.setManagerName("");
sysOrganizationService.updateById(sysOrganization);
sysUser.setIsDelete(1); sysUser.setIsDelete(1);
baseMapper.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sid)); baseMapper.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sid));
} }