|
@@ -19,7 +19,6 @@ import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
|
|
|
import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
|
|
|
import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
|
|
|
import cn.com.ty.lift.system.user.dao.entity.Role;
|
|
|
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
|
|
|
import cn.com.ty.lift.system.user.dao.entity.UserRole;
|
|
|
import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
|
|
|
import cn.com.ty.lift.system.user.service.*;
|
|
@@ -111,14 +110,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
|
|
|
Long companyId = maintenanceCompany.getId();
|
|
|
|
|
|
//创建团队成功
|
|
|
- //1.设置申请用户为企业管理员
|
|
|
- UserAccount userAccount = userAccountService.getByUserId(userId);
|
|
|
- userAccount.setType(ApiConstants.UserConstants.TYPE_ENTERPRISE_ADMIN);
|
|
|
- if (!userAccountService.updateById(userAccount)) {
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新用户信息失败");
|
|
|
- }
|
|
|
- //2.设置用户类型为企业管理员
|
|
|
+ //1.设置用户类型为企业管理员
|
|
|
MtCompanyUser mtCompanyUser = new MtCompanyUser();
|
|
|
mtCompanyUser.setCreateUserId(userId);
|
|
|
mtCompanyUser.setUserId(userId);
|
|
@@ -127,7 +119,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存成员关联公司信息失败");
|
|
|
}
|
|
|
- //3.创建默认角色-企业管理员
|
|
|
+ //2.创建默认角色-企业管理员
|
|
|
Role role = new Role();
|
|
|
role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getLabel());
|
|
|
role.setCode(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getCode());
|
|
@@ -137,7 +129,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
|
|
|
}
|
|
|
- //4.创建用户角色关联关系
|
|
|
+ //3.创建用户角色关联关系
|
|
|
UserRole userRole = new UserRole();
|
|
|
userRole.setUserId(userId);
|
|
|
userRole.setRoleId(role.getId());
|