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 09:40:33 +08:00
parent 0cc0168ad6
commit d8826fef04
2 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
View File

@@ -24,7 +24,7 @@
SELECT menu.*, ISNULL(menuRole.sid) as checked SELECT menu.*, ISNULL(menuRole.sid) as checked
FROM sys_menu menu FROM sys_menu menu
left join sys_role_authorize menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1} left join sys_role_authorize menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
where menu.pSid = #{param2} where menu.pSid = #{param2} and menu.isDelete!='1'
<if test="sourceSid != null"> <if test="sourceSid != null">
and menu.sourceSid = #{sourceSid} and menu.sourceSid = #{sourceSid}
</if> </if>

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

@@ -445,6 +445,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
@Transactional @Transactional
public ResultBean saveStaffInfo(SysStaffinfoDto dto) { public ResultBean saveStaffInfo(SysStaffinfoDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
if(dto.getSysStaffOrg().getManageType().equals("1")){
SysOrganization sysOrgani=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()));
if(StringUtils.isNotBlank(sysOrgani.getManagerSid())){
return rb.setMsg("此部门已有主管");
}
}
String jobNumber = ""; String jobNumber = "";
dto.setMobile(dto.getUserName()); dto.setMobile(dto.getUserName());
SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber(); SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
@@ -477,17 +483,25 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysStaffinfo3.setJobNumber(jobNumber); sysStaffinfo3.setJobNumber(jobNumber);
//增加员工的关联的部门信息 //增加员工的关联的部门信息
SysStaffOrg sysStaffOrg = new SysStaffOrg(); if(dto.getSysStaffOrg().getManageType().equals("1")){
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); SysOrganization sysOrg=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()));
if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) { sysOrg.setManagerSid(sysStaffinfo3.getSid());
return rb.setMsg("所在部门不能为空"); sysOrg.setManagerName(dto.getName());
} sysOrganizationService.updateById(sysOrg);
}else if(dto.getSysStaffOrg().getManageType().equals("3")){
SysStaffOrg sysStaffOrg = new SysStaffOrg();
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
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(dto.getOrgSid()); sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());
sysStaffOrgService.save(sysStaffOrg); sysStaffOrgService.save(sysStaffOrg);
save(sysStaffinfo3); save(sysStaffinfo3);
}
//添加用户信息 //添加用户信息
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setStaffSid(sysStaffinfo3.getSid()); sysUser.setStaffSid(sysStaffinfo3.getSid());
@@ -732,6 +746,12 @@ 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();
if(dto.getSysStaffOrg().getManageType().equals("1")){
SysOrganization sysOrgani=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()));
if(StringUtils.isNotBlank(sysOrgani.getManagerSid())){
return rb.setMsg("此部门已有主管");
}
}
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid)); 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())); List<SysUserRole> d =sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sysUser.getSid()).eq("orgSid",dto.getOrgSid()));
for (SysUserRole sysUserRole : d) { for (SysUserRole sysUserRole : d) {
@@ -739,19 +759,19 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return rb.setMsg("单位管理员不能被修改"); 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())); SysOrganization sysOrg=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()));
if(dto.getSysStaffOrg().getManageType().equals("1")){ if(dto.getSysStaffOrg().getManageType().equals("1")){
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);
}
sysOrg.setManagerSid(sid); sysOrg.setManagerSid(sid);
sysOrg.setManagerName(dto.getName()); sysOrg.setManagerName(dto.getName());
sysOrganizationService.updateById(sysOrg); sysOrganizationService.updateById(sysOrg);