|
@@ -89,6 +89,11 @@ public class SysUserController {
|
|
|
@Autowired
|
|
|
private ISysDepartRoleService departRoleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IUserCompanyService userCompanyService;
|
|
|
+ @Autowired
|
|
|
+ private ISysRoleService roleService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private RedisUtil redisUtil;
|
|
|
@Value("${jeecg.path.upload}")
|
|
@@ -137,7 +142,6 @@ public class SysUserController {
|
|
|
log.info(pageList.toString());
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
|
public Result<List<SysUserVo>> getAllUserListByCompany() {
|
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
@@ -242,6 +246,7 @@ public class SysUserController {
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
|
|
sysUserService.addUserWithRole(user, selectedRoles);
|
|
|
sysUserService.addUserWithDepart(user, selectedDeparts);
|
|
|
+ userCompanyService.addOrUpdateUserWithCompany(user);
|
|
|
result.success("添加成功!");
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(), e);
|
|
@@ -270,6 +275,27 @@ public class SysUserController {
|
|
|
sysUserService.editUserWithRole(user, roles);
|
|
|
sysUserService.editUserWithDepart(user, departs);
|
|
|
sysUserService.updateNullPhoneEmail();
|
|
|
+
|
|
|
+
|
|
|
+ userCompanyService.addOrUpdateUserWithCompany(user);
|
|
|
+ /*if (!Check.isNull(roles)) {
|
|
|
+ Thread thread = new Thread() {
|
|
|
+ @Override
|
|
|
+ public void run() {
|
|
|
+ // org.jeecg.modules.system.entity.SysRole byId = roleService.getById(roles);
|
|
|
+ SysRole byId = roleService.getById(roles);
|
|
|
+ if (!Check.isNull(sysRole)) {
|
|
|
+ QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
|
+ memberQueryWrapper.eq("user_id", user.getId());
|
|
|
+ ProjectMember updateMember = new ProjectMember();
|
|
|
+ updateMember.setRoleCode(sysRole.getRoleCode());
|
|
|
+ memberService.update(updateMember, memberQueryWrapper);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ thread.start();
|
|
|
+ }*/
|
|
|
+
|
|
|
result.success("修改成功!");
|
|
|
}
|
|
|
} catch (Exception e) {
|