添加小助手同时给加角色
This commit is contained in:
+1
@@ -102,6 +102,7 @@ public class ConHelperServiceImpl extends ServiceImpl<ConHelperMapper, ConHelper
|
|||||||
// sysUserModel.setSecondDepartment(secondDepartOrgCode.getId());
|
// sysUserModel.setSecondDepartment(secondDepartOrgCode.getId());
|
||||||
// sysUserModel.setThirdDepartment(thirdDepartOrgCode.getId());
|
// sysUserModel.setThirdDepartment(thirdDepartOrgCode.getId());
|
||||||
sysUserModel.setRealname(conHelperExAndUser.getConHelper().getHelperName());
|
sysUserModel.setRealname(conHelperExAndUser.getConHelper().getHelperName());
|
||||||
|
sysUserModel.setUserRoleCode("helper");
|
||||||
String userId = sysBaseAPI.addUserToEx(sysUserModel);
|
String userId = sysBaseAPI.addUserToEx(sysUserModel);
|
||||||
|
|
||||||
if (!StringUtils.hasLength(userId)) {
|
if (!StringUtils.hasLength(userId)) {
|
||||||
|
|||||||
+2
@@ -44,6 +44,7 @@ public class HealthUserOperatorExServiceImpl extends ServiceImpl<HealthUserOpera
|
|||||||
public Result<String> saveSpeciality(HealthUserOperatorExAndUser data) {
|
public Result<String> saveSpeciality(HealthUserOperatorExAndUser data) {
|
||||||
|
|
||||||
data.getSysUserModel().setPersonType("6");
|
data.getSysUserModel().setPersonType("6");
|
||||||
|
data.getSysUserModel().setUserRoleCode("emg_pro");
|
||||||
String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
|
String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
|
||||||
|
|
||||||
if (StringUtils.isEmpty(userId)) {
|
if (StringUtils.isEmpty(userId)) {
|
||||||
@@ -81,6 +82,7 @@ public class HealthUserOperatorExServiceImpl extends ServiceImpl<HealthUserOpera
|
|||||||
return Result.error("不允许添加管理员");
|
return Result.error("不允许添加管理员");
|
||||||
}
|
}
|
||||||
data.getSysUserModel().setPersonType("5");
|
data.getSysUserModel().setPersonType("5");
|
||||||
|
data.getSysUserModel().setUserRoleCode("emg_opt");
|
||||||
String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
|
String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
|
||||||
if (StringUtils.isEmpty(userId)) {
|
if (StringUtils.isEmpty(userId)) {
|
||||||
return Result.error("添加失败");
|
return Result.error("添加失败");
|
||||||
|
|||||||
+17
-1
@@ -1554,7 +1554,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||||||
}
|
}
|
||||||
userMapper.updateUserOrgCode(user.getId(), orgCode);
|
userMapper.updateUserOrgCode(user.getId(), orgCode);
|
||||||
}
|
}
|
||||||
|
//处理用户角色
|
||||||
|
if(StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())){
|
||||||
|
LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>();
|
||||||
|
roleWrapper.eq(SysRole::getRoleCode,sysUserModel.getUserRoleCode());
|
||||||
|
SysRole sysRole = sysRoleMapper.selectOne(roleWrapper,false);
|
||||||
|
if(null != sysRole){
|
||||||
|
LambdaQueryWrapper<SysUserRole> sysUserRoleWrapper = new LambdaQueryWrapper<>();
|
||||||
|
sysUserRoleWrapper.eq(SysUserRole::getUserId,user.getId());
|
||||||
|
sysUserRoleWrapper.eq(SysUserRole::getRoleId,sysRole.getId());
|
||||||
|
if(!sysUserRoleMapper.exists(sysUserRoleWrapper)){
|
||||||
|
SysUserRole sysUserRole = new SysUserRole();
|
||||||
|
sysUserRole.setRoleId(sysRole.getId());
|
||||||
|
sysUserRole.setUserId(user.getId());
|
||||||
|
sysUserRoleMapper.insert(sysUserRole);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return user.getId();
|
return user.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user