Merge remote-tracking branch 'origin/master'

ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml

@@ -41,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectPostAll" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 	</select>
+
+	<select id="selectYeyPostAll" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+		where purp = '1'
+	</select>
 	
 	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
@@ -54,6 +59,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
 	</select>
+
+	<select id="selectYeyPostListByUserId" parameterType="Long" resultType="Integer">
+		select p.post_id
+        from sys_post p
+	        left join sys_user_post up on up.post_id = p.post_id
+	        left join sys_user u on u.user_id = up.user_id
+	    where p.purp = '1' and u.user_id = #{userId}
+	</select>
 	
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 		select p.post_id, p.post_name, p.post_code

ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -59,6 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 	</select>
+
+	<select id="selectYeyRoleAll" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		where r.purpose = '1'
+	</select>
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
 		select r.role_id
@@ -67,6 +72,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	</select>
+
+	<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
+		select r.role_id
+        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
+	    where r.purpose = '1' and u.user_id = #{userId}
+	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>