|
@@ -1,5 +1,8 @@
|
|
package org.jeecg.modules.system.controller;
|
|
package org.jeecg.modules.system.controller;
|
|
|
|
|
|
|
|
+import cn.com.ctop.common.module.entity.SysRole;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysRoleService;
|
|
|
|
+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;
|
|
@@ -20,6 +23,8 @@ import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.util.PasswordUtil;
|
|
import org.jeecg.common.util.PasswordUtil;
|
|
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.system.entity.SysDepart;
|
|
import org.jeecg.modules.system.entity.SysDepart;
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
import org.jeecg.modules.system.entity.SysUserDepart;
|
|
import org.jeecg.modules.system.entity.SysUserDepart;
|
|
@@ -58,24 +63,22 @@ public class SysUserController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserService sysUserService;
|
|
private ISysUserService sysUserService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysDepartService sysDepartService;
|
|
private ISysDepartService sysDepartService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserRoleService sysUserRoleService;
|
|
private ISysUserRoleService sysUserRoleService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserDepartService sysUserDepartService;
|
|
private ISysUserDepartService sysUserDepartService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserRoleService userRoleService;
|
|
private ISysUserRoleService userRoleService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private RedisUtil redisUtil;
|
|
private RedisUtil redisUtil;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private IUserCompanyService userCompanyService;
|
|
private IUserCompanyService userCompanyService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysRoleService roleService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IProjectMemberService memberService;
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
|
|
@@ -191,9 +194,8 @@ public class SysUserController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
|
|
|
- // @RequiresPermissions("user:edit")
|
|
|
|
|
|
|
|
|
|
+ @RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
|
Result<SysUser> result = new Result<SysUser>();
|
|
Result<SysUser> result = new Result<SysUser>();
|
|
try {
|
|
try {
|
|
@@ -206,11 +208,27 @@ public class SysUserController {
|
|
//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
|
|
//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
|
|
user.setPassword(sysUser.getPassword());
|
|
user.setPassword(sysUser.getPassword());
|
|
String roles = jsonObject.getString("selectedroles");
|
|
String roles = jsonObject.getString("selectedroles");
|
|
-
|
|
|
|
String departs = jsonObject.getString("selecteddeparts");
|
|
String departs = jsonObject.getString("selecteddeparts");
|
|
sysUserService.editUserWithRole(user, roles);
|
|
sysUserService.editUserWithRole(user, roles);
|
|
sysUserService.editUserWithDepart(user, departs);
|
|
sysUserService.editUserWithDepart(user, departs);
|
|
userCompanyService.addOrUpdateUserWithCompany(user);
|
|
userCompanyService.addOrUpdateUserWithCompany(user);
|
|
|
|
+ if (!Check.isNull(roles)) {
|
|
|
|
+ Thread thread = new Thread() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ SysRole sysRole = 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) {
|