20200424-lc-1

增加教师管理关联用户显示和修改功能

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

@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectByTeacherJbxxVo">
         select t.id, t.userid, t.zjhm, t.csrq, t.byyx, t.zy, t.xl, t.xw, t.cjgzrq, t.zgzs, t.createuserid, t.createtime,
-        u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.sex, u.status as user_status
+        u.user_id, u.nick_name, u.status as user_status
         from by_teacher_jbxx t
-            left join sys_user u on t.userid = u.user_id
+            right join sys_user u on t.userid = u.user_id
     </sql>
 
     <select id="selectByTeacherJbxxList" parameterType="ByTeacherJbxx" resultMap="ByTeacherJbxxResult">

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

@@ -58,11 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
+		WHERE r.del_flag = '0'
 	</select>
 
 	<select id="selectYeyRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		where r.purpose = '1'
+		where r.purpose = '1' and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 u.user_id = #{userId}
+	    where u.user_id = #{userId} and r.del_flag = '0'
 	</select>
 
 	<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
@@ -78,12 +79,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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}
+	    where r.purpose = '1' and u.user_id = #{userId} and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		where r.role_id = #{roleId}
+		where r.role_id = #{roleId} and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">