|
@@ -5,6 +5,7 @@ import cn.com.ctop.common.module.annotation.PermissionData;
|
|
import cn.com.ctop.common.module.entity.SysUser;
|
|
import cn.com.ctop.common.module.entity.SysUser;
|
|
import cn.com.ctop.common.module.model.SysUserSysDepartModel;
|
|
import cn.com.ctop.common.module.model.SysUserSysDepartModel;
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
|
|
+import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.vo.SysDepartUsersVO;
|
|
import cn.com.ctop.common.module.vo.SysDepartUsersVO;
|
|
import cn.com.ctop.common.module.vo.SysUserRoleVO;
|
|
import cn.com.ctop.common.module.vo.SysUserRoleVO;
|
|
import cn.com.ctop.common.module.vo.SysUserVo;
|
|
import cn.com.ctop.common.module.vo.SysUserVo;
|
|
@@ -30,6 +31,7 @@ import org.jeecg.common.util.PasswordUtil;
|
|
import org.jeecg.common.util.PmsUtil;
|
|
import org.jeecg.common.util.PmsUtil;
|
|
import org.jeecg.common.util.RedisUtil;
|
|
import org.jeecg.common.util.RedisUtil;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
+import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.system.entity.*;
|
|
import org.jeecg.modules.system.entity.*;
|
|
import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
@@ -91,6 +93,11 @@ public class SysUserController {
|
|
@Autowired
|
|
@Autowired
|
|
private ISysDepartRoleService departRoleService;
|
|
private ISysDepartRoleService departRoleService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserCompanyService userCompanyService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysRoleService roleService;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private RedisUtil redisUtil;
|
|
private RedisUtil redisUtil;
|
|
@Value("${jeecg.path.upload}")
|
|
@Value("${jeecg.path.upload}")
|
|
@@ -242,6 +249,7 @@ public class SysUserController {
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
|
sysUserService.addUserWithRole(user, selectedRoles);
|
|
sysUserService.addUserWithRole(user, selectedRoles);
|
|
sysUserService.addUserWithDepart(user, selectedDeparts);
|
|
sysUserService.addUserWithDepart(user, selectedDeparts);
|
|
|
|
+ userCompanyService.addOrUpdateUserWithCompany(user);
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|
|
@@ -270,6 +278,27 @@ public class SysUserController {
|
|
sysUserService.editUserWithRole(user, roles);
|
|
sysUserService.editUserWithRole(user, roles);
|
|
sysUserService.editUserWithDepart(user, departs);
|
|
sysUserService.editUserWithDepart(user, departs);
|
|
sysUserService.updateNullPhoneEmail();
|
|
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("修改成功!");
|
|
result.success("修改成功!");
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|