java/FinancialDataBigScreen.git

			@@ -24,8 +24,19 @@
			</resultMap>

			<sql id="selectRoleVo">
			select distinct r.role_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.postType,r.removeDays
			select distinct r.role_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.postType,
			r.removeDays
			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
			@@ -96,9 +107,11 @@
			</where>
			</select>
			<select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysRole">
			select role_id AS roleId, role_name AS roleName, role_key AS roleKey, role_sort AS roleSort, data_scope AS dataScope,
			menu_check_strictly AS menuCheckStrictly, dept_check_strictly AS deptCheckStrictly,status AS status, del_flag AS delFlag,
			create_time AS createTime,create_by AS createBy,postType AS postType,removeDays AS removeDays
			select role_id AS roleId, role_name AS roleName, role_key AS roleKey, role_sort AS roleSort,
			data_scope AS dataScope,
			menu_check_strictly AS menuCheckStrictly, dept_check_strictly AS deptCheckStrictly,status AS
			status, del_flag AS delFlag,
			create_time AS createTime,create_by AS createBy
			from sys_role
			<where>
			<if test="query.roleName != null and query.roleName != ''">
			@@ -120,22 +133,42 @@
			</where>
			</select>
			<select id="selectListByDelFlag" resultType="com.ruoyi.common.core.domain.entity.SysRole">
			select role_id AS roleId, role_name AS roleName, role_key AS roleKey, role_sort AS roleSort, data_scope AS dataScope,
			menu_check_strictly AS menuCheckStrictly, dept_check_strictly AS deptCheckStrictly,status AS status, del_flag AS delFlag,
			create_time AS createTime,create_by AS createBy,postType AS postType,removeDays AS removeDays
			from sys_role where del_flag = 0
			select role_id AS roleId,
			role_name AS roleName,
			role_key AS roleKey,
			role_sort AS roleSort,
			data_scope AS dataScope,
			menu_check_strictly AS menuCheckStrictly,
			dept_check_strictly AS deptCheckStrictly,
			status AS status,
			del_flag AS delFlag,
			create_time AS createTime,
			create_by AS createBy,
			postType AS postType,
			removeDays AS removeDays
			from sys_role
			where del_flag = 0
			</select>

			<select id="selectRoleByUserId" resultType="com.ruoyi.common.core.domain.entity.SysRole">
			select distinct r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope,
			r.menu_check_strictly AS menuCheckStrictly, r.dept_check_strictly AS deptCheckStrictly,r.status AS status,
			r.del_flag AS delFlag, r.create_time AS createTime,r.create_by AS createBy
			select distinct r.role_id AS roleId,
			r.role_name AS roleName,
			r.role_key AS roleKey,
			r.role_sort AS roleSort,
			r.data_scope AS dataScope,
			r.menu_check_strictly AS menuCheckStrictly,
			r.dept_check_strictly AS deptCheckStrictly,
			r.status AS status,
			r.del_flag AS delFlag,
			r.create_time AS createTime,
			r.create_by AS createBy
			from sys_role r
			left join sys_user_role ur on ur.role_id = r.role_id
			where ur.user_id = #{userId}
			</select>
			<select id="selectByUserId" resultType="java.lang.String">
			select t2.role_name from sys_user_role t1
			select t2.role_name
			from sys_user_role t1
			left join sys_role t2 on t1.role_id = t2.role_id
			where t1.user_id = #{userId}
			</select>
			@@ -201,7 +234,9 @@
			</update>

			<delete id="deleteRoleById" parameterType="Long">
			update sys_role set del_flag = '2' where role_id = #{roleId}
			update sys_role
			set del_flag = '2'
			where role_id = #{roleId}
			</delete>

			<delete id="deleteRoleByIds" parameterType="Long">