角色管理

tianhu-system/src/main/java/com/tianhu/system/controller/SysRoleController.java

@@ -58,12 +58,11 @@ public class SysRoleController extends BaseController
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser user = userInfo.getSysUser();
         String companyId = user.getCompanyId();
+        role.setIsAuto("0");
         //判断是否为运维管理员 000000：代表运维管理员
         if(!SalaryConstants.OPEX.equals(companyId)){
             role.setCompanyId(companyId);
         }
-        //System.out.println("角色查询列表，增加查询条件isauto=0");
-        role.setIsAuto("0");
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
     }

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysRoleServiceImpl.java

@@ -333,8 +333,6 @@ public class SysRoleServiceImpl implements ISysRoleService
         }
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenu(roleIds);
-        // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
         return roleMapper.deleteRoleByIds(roleIds);
     }
 }

tianhu-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"           column="update_by"             />
 		<result property="updateTime"         column="update_time"           />
 		<result property="remark"             column="remark"                />
+		<result property="isAuto"             column="is_auto"                />
 	</resultMap>
 	
 	<sql id="selectRoleVo">
 	    select distinct r.role_id,r.company_id,r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark 
+            r.status, r.del_flag, r.create_time, r.remark, r.is_auto
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
@@ -80,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
+	    and r.is_auto != '1'
 	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">