|
@@ -22,7 +22,9 @@ import com.fs.company.mapper.*;
|
|
|
import com.fs.company.param.CompanyUserAreaParam;
|
|
|
import com.fs.company.param.CompanyUserCodeParam;
|
|
|
import com.fs.company.param.CompanyUserQwParam;
|
|
|
+import com.fs.company.service.ICompanyRoleService;
|
|
|
import com.fs.company.service.ICompanyService;
|
|
|
+import com.fs.company.service.ICompanyUserRoleService;
|
|
|
import com.fs.company.service.ICompanyUserService;
|
|
|
import com.fs.company.vo.*;
|
|
|
import com.fs.course.service.IFsUserCompanyUserService;
|
|
@@ -45,6 +47,8 @@ import com.fs.qw.vo.QwOptionsVO;
|
|
|
import com.fs.qw.vo.QwUserVO;
|
|
|
import com.fs.system.oss.CloudStorageService;
|
|
|
import com.fs.system.oss.OSSFactory;
|
|
|
+import com.fs.system.service.ISysRoleService;
|
|
|
+import com.fs.system.service.ISysUserService;
|
|
|
import com.fs.voice.utils.StringUtil;
|
|
|
import com.fs.wxUser.domain.CompanyWxUser;
|
|
|
import org.slf4j.Logger;
|
|
@@ -72,6 +76,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
{
|
|
|
@Autowired
|
|
|
private CompanyUserMapper companyUserMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
private CompanyRoleMapper roleMapper;
|
|
|
|
|
@@ -108,10 +113,16 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
@Autowired
|
|
|
private ICompanyService companyService;
|
|
|
|
|
|
-
|
|
|
@Autowired
|
|
|
private IQwUserService qwUserService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysRoleService sysRoleService;
|
|
|
+
|
|
|
+// @Autowired
|
|
|
+// private ICompanyUserRoleService userRoleService;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 查询物业公司管理员信息
|
|
|
*
|
|
@@ -1006,4 +1017,32 @@ public class CompanyUserServiceImpl implements ICompanyUserService
|
|
|
}
|
|
|
return R.error();
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 批量修改角色
|
|
|
+ * @param batchUserRolesVO 批量修改角色参数
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public R updateBatchUserRoles(BatchUserRolesVO batchUserRolesVO) {
|
|
|
+ Long[] roleIds = batchUserRolesVO.getRoleIds();
|
|
|
+ Long[] userIds = batchUserRolesVO.getUserIds();
|
|
|
+ //先删除之前关联的角色
|
|
|
+ userRoleMapper.deleteCompanyUserRoleByIds(userIds);
|
|
|
+ for (Long userId : userIds){
|
|
|
+ try {
|
|
|
+ CompanyUser companyUser = selectCompanyUserById(userId);
|
|
|
+ companyUser.setRoleIds(roleIds);
|
|
|
+ // 新增用户与角色管理
|
|
|
+ insertUserRole(companyUser);
|
|
|
+ // 删除用户与岗位关联
|
|
|
+ userPostMapper.deleteUserPostByUserId(userId);
|
|
|
+ // 新增用户与岗位管理
|
|
|
+ insertUserPost(companyUser);
|
|
|
+ companyUserMapper.updateCompanyUser(companyUser);
|
|
|
+ }catch (Exception exception){
|
|
|
+ throw new CustomException("修改失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return R.ok("修改成功");
|
|
|
+ }
|
|
|
}
|