From 4110ca21ef90410f981cea007626c54344582f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Mon, 27 Sep 2021 11:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=80=E4=BB=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/SysDeptMapper.xml | 26 +++++++++----------
 .../resources/mapper/system/SysMenuMapper.xml | 24 ++++++++---------
 .../resources/mapper/system/SysPostMapper.xml | 12 ++++-----
 .../resources/mapper/system/SysUserMapper.xml | 18 ++++++-------
 .../mapper/system/SysUserRoleMapper.xml       | 14 +++++-----
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index b643199..ac76368 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -24,12 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
-        from sys_dept d
+        from sys_dept_wms d
     </sql>
     
 	<select id="selectRoleDeptTree" parameterType="Long" resultType="String">
 		select concat(d.dept_id, d.dept_name) as dept_name
-		from sys_dept d
+		from sys_dept_wms d
 			left join sys_role_dept rd on d.dept_id = rd.dept_id
 		where d.del_flag = '0' and rd.role_id = #{roleId}
 		order by d.parent_id, d.order_num
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectDeptCount" parameterType="SysDept" resultType="int">
-		select count(1) from sys_dept
+		select count(1) from sys_dept_wms
 		where del_flag = '0'
 		<if test="deptId != null and deptId != 0"> and dept_id = #{deptId} </if>
 		<if test="parentId != null and parentId != 0"> and parent_id = #{parentId} </if>
@@ -73,24 +73,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
-		from sys_dept d
+			(select dept_name from sys_dept_wms where dept_id = d.parent_id) parent_name
+		from sys_dept_wms d
 		where d.dept_id = #{deptId}
 	</select>
 
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where FIND_IN_SET (#{deptId}, ancestors) <![CDATA[ <> ]]> 0
+		select * from sys_dept_wms where FIND_IN_SET (#{deptId}, ancestors) <![CDATA[ <> ]]> 0
 	</select>
 	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+		select count(*) from sys_dept_wms where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 	</select>
 	
 	<insert id="insertDept" parameterType="SysDept">
 	    <selectKey keyProperty="deptId" order="BEFORE" resultType="Long">
-			select seq_sys_dept.nextval as deptId from DUAL
+			select seq_sys_dept_wms.nextval as deptId from DUAL
 		</selectKey>
- 		insert into sys_dept(
+ 		insert into sys_dept_wms(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<update id="updateDept" parameterType="SysDept">
- 		update sys_dept
+ 		update sys_dept_wms
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="updateDeptChildren" parameterType="java.util.List">
-	    update sys_dept set ancestors =
+	    update sys_dept_wms set ancestors =
 	    <foreach collection="depts" item="item" index="index"
 	        separator=" " open="case dept_id" close="end">
 	        when #{item.deptId} then #{item.ancestors}
@@ -148,11 +148,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	 </update>
 
 	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+		update sys_dept_wms set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 	
 	<update id="updateDeptStatusNormal" parameterType="Long">
- 	    update sys_dept set status = '0' where dept_id in 
+ 	    update sys_dept_wms set status = '0' where dept_id in
  	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
         	#{deptId}
         </foreach>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index f4edb76..e2dc390 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -33,7 +33,7 @@
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
 			 LEFT JOIN sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
@@ -55,7 +55,7 @@
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
 			 LEFT JOIN sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{userId}
 		order by m.parent_id, m.order_num
@@ -65,7 +65,7 @@
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
 			 left join sys_role r on r.role_id = ur.role_id
 		where m.visible = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
@@ -93,9 +93,9 @@
 
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
-		from sys_menu m
+		from sys_menu_wms m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
-		left join sys_user_role ur on rm.role_id = ur.role_id
+		left join sys_user_role_wms ur on rm.role_id = ur.role_id
 		LEFT JOIN sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
@@ -108,18 +108,18 @@
 	</select>
 
 	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId} or parent_id = #{menuId}
+	    delete from sys_menu_wms where menu_id = #{menuId} or parent_id = #{menuId}
 	</delete>
 
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.target, t.menu_type, t.visible, t.is_refresh, t.perms, t.icon, t.remark,
-			(SELECT menu_name FROM sys_menu WHERE menu_id = t.parent_id) parent_name
-		FROM sys_menu t
+			(SELECT menu_name FROM sys_menu_wms WHERE menu_id = t.parent_id) parent_name
+		FROM sys_menu_wms t
 		where t.menu_id = #{menuId}
 	</select>
 
 	<select id="selectCountMenuByParentId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id=#{menuId}  
+	    select count(1) from sys_menu_wms where parent_id=#{menuId}
 	</select>
 
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
@@ -128,7 +128,7 @@
 	</select>
 
 	<update id="updateMenu" parameterType="SysMenu">
-		update sys_menu
+		update sys_menu_wms
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
@@ -149,9 +149,9 @@
 
 	<insert id="insertMenu" parameterType="SysMenu">
 		<selectKey keyProperty="menuId" order="BEFORE" resultType="Long">
-			select seq_sys_menu.nextval as menuId from DUAL
+			select seq_sys_menu_wms.nextval as menuId from DUAL
 		</selectKey>
-		insert into sys_menu(
+		insert into sys_menu_wms(
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 2d7af35..8de207b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectPostVo">
         select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
-		from sys_post
+		from sys_post_wms
     </sql>
 	
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT p.post_id, p.post_name, p.post_code
 		FROM sys_user u
 			 LEFT JOIN sys_user_post up ON u.user_id = up.user_id
-			 LEFT JOIN sys_post p ON up.post_id = p.post_id
+			 LEFT JOIN sys_post_wms p ON up.post_id = p.post_id
 		WHERE up.user_id = #{userId}
 	</select>
 	
@@ -65,14 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
  	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
+ 		delete from sys_post_wms where post_id in
  		<foreach collection="array" item="postId" open="(" separator="," close=")">
  			#{postId}
         </foreach> 
  	</delete>
  	
  	<update id="updatePost" parameterType="SysPost">
- 		update sys_post
+ 		update sys_post_wms
  		<set>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
  			<if test="postName != null and postName != ''">post_name = #{postName},</if>
@@ -87,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	
  	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
  	    <selectKey keyProperty="postId" order="BEFORE" resultType="Long">
-			select seq_sys_post.nextval as postId from DUAL
+			select seq_sys_post_wms.nextval as postId from DUAL
 		</selectKey>
- 		insert into sys_post(
+ 		insert into sys_post_wms(
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 47da7f4..635682a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -53,14 +53,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
 		from sys_user_wms u
-			 left join sys_dept d on u.dept_id = d.dept_id
-			 left join sys_user_role ur on u.user_id = ur.user_id
+			 left join sys_dept_wms d on u.dept_id = d.dept_id
+			 left join sys_user_role_wms ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user_wms u
-		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_dept_wms d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.create_time &lt;= to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId}, ancestors) <![CDATA[ <> ]]> 0 ))
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept_wms t WHERE FIND_IN_SET (#{deptId}, ancestors) <![CDATA[ <> ]]> 0 ))
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
@@ -90,8 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time
 	    from sys_user_wms u
-			 left join sys_dept d on u.dept_id = d.dept_id
-			 left join sys_user_role ur on u.user_id = ur.user_id
+			 left join sys_dept_wms d on u.dept_id = d.dept_id
+			 left join sys_user_role_wms ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and r.role_id = #{roleId}
 	    <if test="loginName != null and loginName != ''">
@@ -107,11 +107,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time
 	    from sys_user_wms u
-			 left join sys_dept d on u.dept_id = d.dept_id
-			 left join sys_user_role ur on u.user_id = ur.user_id
+			 left join sys_dept_wms d on u.dept_id = d.dept_id
+			 left join sys_user_role_wms ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-	    and u.user_id not in (select u.user_id from sys_user_wms u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
+	    and u.user_id not in (select u.user_id from sys_user_wms u inner join sys_user_role_wms ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
 	    <if test="loginName != null and loginName != ''">
 			AND u.login_name like concat(concat('%', #{loginName}), '%')
 		</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index d434f0f..dcb2854 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -10,19 +10,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<select id="selectUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
-		select user_id, role_id from sys_user_role where user_id = #{userId}
+		select user_id, role_id from sys_user_role_wms where user_id = #{userId}
 	</select>
 
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
-		delete from sys_user_role where user_id = #{userId}
+		delete from sys_user_role_wms where user_id = #{userId}
 	</delete>
 	
 	<select id="countUserRoleByRoleId" resultType="Integer">
-	    select count(1) from sys_user_role where role_id = #{roleId}  
+	    select count(1) from sys_user_role_wms where role_id = #{roleId}
 	</select>
 	
 	<delete id="deleteUserRole" parameterType="Long">
- 		delete from sys_user_role where user_id in
+ 		delete from sys_user_role_wms where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
         </foreach> 
@@ -31,17 +31,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="batchUserRole" useGeneratedKeys="false">
 		insert all
 		<foreach item="item" index="index" collection="list">
-			into sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId})
+			into sys_user_role_wms(user_id, role_id) values (#{item.userId},#{item.roleId})
 		</foreach>
 		SELECT 1 FROM DUAL
 	</insert>
 	
 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+		delete from sys_user_role_wms where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 	
 	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
+	    delete from sys_user_role_wms where role_id=#{roleId} and user_id in
  	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
  	        #{userId}
             </foreach>