|
@ -732,7 +732,34 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
*/ |
|
|
*/ |
|
|
public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) { |
|
|
public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
//查询该人员的组织机构list
|
|
|
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid)); |
|
|
|
|
|
List<SysUserRole> d =sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sysUser.getSid()).eq("orgSid",dto.getOrgSid())); |
|
|
|
|
|
for (SysUserRole sysUserRole : d) { |
|
|
|
|
|
if(sysUserRole.getRoleSid().equals("002")){ |
|
|
|
|
|
return rb.setMsg("单位管理员不能被修改"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
SysOrganization sysOrgan=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()).eq("managerSid",sid)); |
|
|
|
|
|
if(null!=sysOrgan){ |
|
|
|
|
|
sysOrgan.setManagerName(""); |
|
|
|
|
|
sysOrgan.setManagerSid(""); |
|
|
|
|
|
sysOrganizationService.updateById(sysOrgan); |
|
|
|
|
|
} |
|
|
|
|
|
SysStaffOrg sysStaffOrgs=sysStaffOrgService.getOne(new QueryWrapper<SysStaffOrg>().eq("staffSid",sid).eq("manageType","2").eq("orgSid",dto.getSysStaffOrg().getOrgSid()));//查询该人员的组织机构list
|
|
|
|
|
|
if(null!=sysStaffOrgs){ |
|
|
|
|
|
sysStaffOrgs.setManageType("3"); |
|
|
|
|
|
sysStaffOrgService.updateById(sysStaffOrgs); |
|
|
|
|
|
} |
|
|
|
|
|
SysOrganization sysOrg=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid())); |
|
|
|
|
|
if(dto.getSysStaffOrg().getManageType().equals("1")){ |
|
|
|
|
|
sysOrg.setManagerSid(sid); |
|
|
|
|
|
sysOrg.setManagerName(dto.getName()); |
|
|
|
|
|
sysOrganizationService.updateById(sysOrg); |
|
|
|
|
|
}else if (dto.getSysStaffOrg().getManageType().equals("3")){ |
|
|
|
|
|
sysOrg.setManagerSid(""); |
|
|
|
|
|
sysOrg.setManagerName(""); |
|
|
|
|
|
sysOrganizationService.updateById(sysOrg); |
|
|
|
|
|
} |
|
|
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid); |
|
|
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid); |
|
|
List<String> orgList = new ArrayList<>(); |
|
|
List<String> orgList = new ArrayList<>(); |
|
|
if (sysStaffOrgVos.size() > 0) { |
|
|
if (sysStaffOrgVos.size() > 0) { |
|
@ -766,7 +793,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
|
|
|
|
|
|
//更新用户信息
|
|
|
//更新用户信息
|
|
|
// sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
|
|
|
// sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
|
|
|
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid)); |
|
|
// SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
|
|
|
sysUser.setAccountType(dto.getAccountType()); |
|
|
sysUser.setAccountType(dto.getAccountType()); |
|
|
sysUser.setUserType(dto.getUserType()); |
|
|
sysUser.setUserType(dto.getUserType()); |
|
|
sysUser.setRemarks(dto.getRemarks()); |
|
|
sysUser.setRemarks(dto.getRemarks()); |
|
@ -779,8 +806,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
//更新员工的关联的部门信息
|
|
|
//更新员工的关联的部门信息
|
|
|
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); |
|
|
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); |
|
|
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid,dto.getSysStaffOrg().getOrgSid1()); |
|
|
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid,dto.getSysStaffOrg().getOrgSid1()); |
|
|
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); |
|
|
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg,"manageType"); |
|
|
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType()); |
|
|
// sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
|
|
|
if(StringUtils.isBlank(sysStaffOrg.getOrgSid())){ |
|
|
if(StringUtils.isBlank(sysStaffOrg.getOrgSid())){ |
|
|
sysStaffOrg.setOrgSid(dto.getOrgSid()); |
|
|
sysStaffOrg.setOrgSid(dto.getOrgSid()); |
|
|
} |
|
|
} |
|
@ -859,6 +886,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
// SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
|
|
|
// SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
|
|
|
SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sysUser.getStaffSid(), orgSid, type); |
|
|
SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sysUser.getStaffSid(), orgSid, type); |
|
|
SysOrganization s =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",orgSid1)); |
|
|
SysOrganization s =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",orgSid1)); |
|
|
|
|
|
if(StringUtils.isNotBlank(s.getManagerSid())){ |
|
|
|
|
|
if(s.getManagerSid().equals(sysUser.getStaffSid())){ |
|
|
|
|
|
sysStaffOrgDetailsVo.setManageType("1"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
s.setOrgSidPath(s.getOrgSidPath()+"/"); |
|
|
s.setOrgSidPath(s.getOrgSidPath()+"/"); |
|
|
String b[]=s.getOrgSidPath().split("/"); |
|
|
String b[]=s.getOrgSidPath().split("/"); |
|
|
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid(),b[0]); |
|
|
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid(),b[0]); |
|
@ -926,6 +958,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public List<Map<String, String>> getStaffName(String staffName,String deptSid) { |
|
|
public List<Map<String, String>> getStaffName(String staffName,String deptSid) { |
|
|
|
|
|
|
|
|
QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>(); |
|
|
QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>(); |
|
|
SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",deptSid)); |
|
|
SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",deptSid)); |
|
|
sysOrganization.setOrgSidPath(sysOrganization.getOrgSidPath()+"/"); |
|
|
sysOrganization.setOrgSidPath(sysOrganization.getOrgSidPath()+"/"); |
|
@ -933,11 +966,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
if (StringUtils.isNotBlank(staffName)) { |
|
|
if (StringUtils.isNotBlank(staffName)) { |
|
|
qw.like("ss.name", staffName); |
|
|
qw.like("ss.name", staffName); |
|
|
} |
|
|
} |
|
|
qw.eq("ss.isDelete", 0); |
|
|
qw.eq("s.isDelete", 0); |
|
|
qw.ne("sso.orgSid", deptSid); |
|
|
qw.ne("sso.orgSid", deptSid); |
|
|
qw.like("o.orgSidPath", orgSids[0]); |
|
|
qw.like("o.orgSidPath", orgSids[0]); |
|
|
// qw.ne("ss.personTypeKey","01");
|
|
|
qw.eq("sso.manageType","3"); |
|
|
return baseMapper.getStaffName(qw); |
|
|
List<Map<String, String>> maps =baseMapper.getStaffName(qw).stream().filter(s->!s.get("name").equals("单位管理员")).collect(toList()); |
|
|
|
|
|
return maps; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) { |
|
|
public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) { |
|
@ -946,8 +980,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, |
|
|
qw.like("ss.name", staffName); |
|
|
qw.like("ss.name", staffName); |
|
|
} |
|
|
} |
|
|
qw.eq("sso.orgSid", deptSid); |
|
|
qw.eq("sso.orgSid", deptSid); |
|
|
qw.eq("ss.isDelete", 0); |
|
|
qw.eq("s.isDelete", 0); |
|
|
// qw.ne("ss.personTypeKey","01");
|
|
|
qw.eq("sso.manageType","3"); |
|
|
return baseMapper.getStaffNameByDeptSid(qw); |
|
|
return baseMapper.getStaffNameByDeptSid(qw); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|