Pārlūkot izejas kodu

修改角色同步修改项目下角色

yumeng 5 gadi atpakaļ
vecāks
revīzija
936db910cf

+ 27 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1,5 +1,8 @@
 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.SysUserRoleVO;
 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.RedisUtil;
 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.SysUser;
 import org.jeecg.modules.system.entity.SysUserDepart;
@@ -58,24 +63,22 @@ public class SysUserController {
 
     @Autowired
     private ISysUserService sysUserService;
-
     @Autowired
     private ISysDepartService sysDepartService;
-
     @Autowired
     private ISysUserRoleService sysUserRoleService;
-
     @Autowired
     private ISysUserDepartService sysUserDepartService;
-
     @Autowired
     private ISysUserRoleService userRoleService;
-
     @Autowired
     private RedisUtil redisUtil;
-
     @Autowired
     private IUserCompanyService userCompanyService;
+    @Autowired
+    private ISysRoleService roleService;
+    @Autowired
+    private IProjectMemberService memberService;
 
 
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -191,9 +194,8 @@ public class SysUserController {
         return result;
     }
 
-    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
-    //	@RequiresPermissions("user:edit")
 
+    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
     public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
         Result<SysUser> result = new Result<SysUser>();
         try {
@@ -206,11 +208,27 @@ public class SysUserController {
                 //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
                 user.setPassword(sysUser.getPassword());
                 String roles = jsonObject.getString("selectedroles");
-
                 String departs = jsonObject.getString("selecteddeparts");
                 sysUserService.editUserWithRole(user, roles);
                 sysUserService.editUserWithDepart(user, departs);
                 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("修改成功!");
             }
         } catch (Exception e) {

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysRoleMapper.java

@@ -20,7 +20,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
     /**
      * 根据roleCode获取相对应的用户信息
      */
-    List<UserDto> getUserByRoleCode(@Param("roleCode") String roleCode);
+
 
     String getRoleIdByRoleCode(@Param("roleCode") String roleCode);
 

+ 0 - 16
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysRoleMapper.xml

@@ -2,22 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.common.module.mapper.SysRoleMapper">
 
-	<!-- 根据rolecode获取相对应角色所有的人 -->
-    <select id="getUserByRoleCode" resultType="cn.com.ctop.common.module.vo.UserDto">
-			select
-			a.id as userId,
-			a.realname,
-			c.id as roleId,
-			c.role_name as roleName
-		from
-		sys_user a
-		left join sys_user_role b on a.id = b.user_id
-		left join sys_role c on b.role_id = c.id
-		left join sys_
-        where
-        c.role_code = #{roleCode}
-	</select>
-
 	<!-- 根据roleCode获取roleId -->
 	<select id="getRoleIdByRoleCode" resultType="java.lang.String">
 		select