Pre Merge pull request !223 from 精神小伙/RuoYi_standard_zf

doc/test

@@ -0,0 +1 @@
+test

doc/test1

@@ -0,0 +1 @@
+test1 测试1 11111111111111

ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
+    <resultMap type="SysUserPost" id="SysUserPostResult">
-		<result property="userId"     column="user_id"      />
+        <result property="userId"     column="user_id"      />
-		<result property="postId"     column="post_id"      />
+        <result property="postId"     column="post_id"      />
-	</resultMap>
+    </resultMap>
+
+    <delete id="deleteUserPostByUserId" parameterType="Long">
+        delete from sys_user_post where user_id=#{userId}
+    </delete>
+
+    <select id="countUserPostById" resultType="Integer">
+        select count(1) from sys_user_post where post_id=#{postId}
+    </select>
+
+    <delete id="deleteUserPost" parameterType="Long">
+        delete from sys_user_post where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <insert id="batchUserPost">
+        insert into sys_user_post(user_id, post_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.postId})
+        </foreach>
+    </insert>
 
-	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
-	</select>
-	
-	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.postId})
-		</foreach>
-	</insert>
-	
 </mapper> 

ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
+    <resultMap type="SysUserRole" id="SysUserRoleResult">
-		<result property="userId"     column="user_id"      />
+        <result property="userId"     column="user_id"      />
-		<result property="roleId"     column="role_id"      />
+        <result property="roleId"     column="role_id"      />
-	</resultMap>
+    </resultMap>
-	
-	<select id="selectUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
-		select user_id, role_id from sys_user_role where user_id = #{userId}
-	</select>
 
-	<delete id="deleteUserRoleByUserId" parameterType="Long">
+    <select id="selectUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
-		delete from sys_user_role where user_id = #{userId}
+        select user_id, role_id from sys_user_role where user_id = #{userId}
-	</delete>
+    </select>
-	
+
-	<select id="countUserRoleByRoleId" resultType="Integer">
+    <delete id="deleteUserRoleByUserId" parameterType="Long">
-	    select count(1) from sys_user_role where role_id = #{roleId}  
+        delete from sys_user_role where user_id = #{userId}
-	</select>
+    </delete>
-	
+
-	<delete id="deleteUserRole" parameterType="Long">
+    <select id="countUserRoleByRoleId" resultType="Integer">
- 		delete from sys_user_role where user_id in
+        select count(1) from sys_user_role where role_id = #{roleId}
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+    </select>
- 			#{userId}
+
-        </foreach> 
+    <delete id="deleteUserRole" parameterType="Long">
- 	</delete>
+        delete from sys_user_role where user_id in
-	
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
-	<insert id="batchUserRole">
+            #{userId}
-		insert into sys_user_role(user_id, role_id) values
+        </foreach>
-		<foreach item="item" index="index" collection="list" separator=",">
+    </delete>
-			(#{item.userId},#{item.roleId})
+
-		</foreach>
+    <insert id="batchUserRole">
-	</insert>
+        insert into sys_user_role(user_id, role_id) values
-	
+        <foreach item="item" index="index" collection="list" separator=",">
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+            (#{item.userId},#{item.roleId})
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+        </foreach>
-	</delete>
+    </insert>
-	
+
-	<delete id="deleteUserRoleInfos">
+    <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
+        delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+    </delete>
- 	        #{userId}
+
-            </foreach> 
+    <delete id="deleteUserRoleInfos">
-	</delete>
+        delete from sys_user_role where role_id=#{roleId} and user_id in
+        <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
 </mapper>