From a47192229e3d7164e7b78d5b1105b8c1ab0a1c36 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 29 九月 2022 15:05:18 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/data/DirMapper.xml     |    2 +-
 src/main/resources/mapper/data/RoleMapper.xml    |    4 ++--
 src/main/resources/mapper/data/StyleMapper.xml   |    2 +-
 src/main/resources/mapper/data/ResOpMapper.xml   |    4 ++--
 src/main/resources/mapper/data/ResMapper.xml     |    4 ++--
 src/main/resources/mapper/data/DictMapper.xml    |    2 +-
 src/main/resources/mapper/data/TokenMapper.xml   |    4 ++--
 src/main/resources/mapper/data/LoginMapper.xml   |    4 ++--
 src/main/resources/mapper/data/UsersMapper.xml   |    2 +-
 src/main/resources/mapper/data/DepMapper.xml     |    2 +-
 src/main/resources/mapper/data/VersionMapper.xml |    4 ++--
 src/main/resources/mapper/data/MenusMapper.xml   |    4 ++--
 src/main/resources/mapper/data/OperateMapper.xml |    3 ++-
 src/main/resources/mapper/data/AuthMapper.xml    |    4 ++--
 14 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/data/AuthMapper.xml b/src/main/resources/mapper/data/AuthMapper.xml
index f669622..9db108e 100644
--- a/src/main/resources/mapper/data/AuthMapper.xml
+++ b/src/main/resources/mapper/data/AuthMapper.xml
@@ -20,13 +20,13 @@
                 name = #{name}
             </if>
         </where>
-
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectAuthAll" resultType="com.lf.server.entity.data.AuthEntity">
-        select * from lf.sys_auth
+        select * from lf.sys_auth order by id
     </select>
 
     <select id="selectAuth" resultType="com.lf.server.entity.data.AuthEntity">
diff --git a/src/main/resources/mapper/data/DepMapper.xml b/src/main/resources/mapper/data/DepMapper.xml
index c067ebb..33f88b4 100644
--- a/src/main/resources/mapper/data/DepMapper.xml
+++ b/src/main/resources/mapper/data/DepMapper.xml
@@ -10,7 +10,7 @@
         <result property="updateTime" column="update_time"></result>
     </resultMap>
     <select id="selectDepAll" resultMap="resultMap" resultType="com.lf.server.entity.data.DepEntity">
-        select * from lf.sys_dep
+        select * from lf.sys_dep order by id;
     </select>
 
     <select id="selectDep" resultMap="resultMap" resultType="com.lf.server.entity.data.DepEntity">
diff --git a/src/main/resources/mapper/data/DictMapper.xml b/src/main/resources/mapper/data/DictMapper.xml
index 96406e5..66c9601 100644
--- a/src/main/resources/mapper/data/DictMapper.xml
+++ b/src/main/resources/mapper/data/DictMapper.xml
@@ -38,7 +38,7 @@
     </select>
 
     <select id="selectDictAll" resultType="com.lf.server.entity.data.DictEntity">
-        select * from lf.sys_dict
+        select * from lf.sys_dict order by id;
     </select>
 
     <select id="selectDict" resultType="com.lf.server.entity.data.DictEntity">
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index ef61ce0..4578d99 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -15,7 +15,7 @@
     </select>
 
     <select id="selectDirAll" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
-        select * from lf.sys_dir
+        select * from lf.sys_dir order by id;
     </select>
 
     <insert id="insertDir" parameterType="com.lf.server.entity.data.DirEntity">
diff --git a/src/main/resources/mapper/data/LoginMapper.xml b/src/main/resources/mapper/data/LoginMapper.xml
index 8595690..82db198 100644
--- a/src/main/resources/mapper/data/LoginMapper.xml
+++ b/src/main/resources/mapper/data/LoginMapper.xml
@@ -20,13 +20,13 @@
                 userid = #{userid}
             </if>
         </where>
-
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectLoginAll" resultType="com.lf.server.entity.data.LoginEntity">
-        select * from lf.sys_login
+        select * from lf.sys_login order by id;
     </select>
 
     <select id="selectLogin" resultType="com.lf.server.entity.data.LoginEntity">
diff --git a/src/main/resources/mapper/data/MenusMapper.xml b/src/main/resources/mapper/data/MenusMapper.xml
index eccedc5..2853875 100644
--- a/src/main/resources/mapper/data/MenusMapper.xml
+++ b/src/main/resources/mapper/data/MenusMapper.xml
@@ -13,7 +13,7 @@
         <result property="updateTime" column="update_time"></result>
     </resultMap>
     <select id="selectMenuAll" resultMap="resultMap" resultType="com.lf.server.entity.data.MenusEntity">
-        select * from lf.sys_menu
+        select * from lf.sys_menu order by id;
     </select>
 
     <select id="selectMenu" resultMap="resultMap" resultType="com.lf.server.entity.data.MenusEntity">
@@ -52,6 +52,6 @@
 
     <update id="updateMenu">
     update lf.sys_menu set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},perms=#{perms},type=#{type},icon=#{icon},level=#{level},
-    order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=#{updateTime},bak=#{bak} where id=#{id}
+    order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/data/OperateMapper.xml b/src/main/resources/mapper/data/OperateMapper.xml
index 393e4b9..940b2ea 100644
--- a/src/main/resources/mapper/data/OperateMapper.xml
+++ b/src/main/resources/mapper/data/OperateMapper.xml
@@ -20,12 +20,13 @@
                 userid = #{userid}
             </if>
         </where>
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectOperateAll" resultType="com.lf.server.entity.data.OperateEntity">
-        select * from lf.sys_operate
+        select * from lf.sys_operate order by id;
     </select>
 
     <select id="selectOperate" resultType="com.lf.server.entity.data.OperateEntity">
diff --git a/src/main/resources/mapper/data/ResMapper.xml b/src/main/resources/mapper/data/ResMapper.xml
index d84272e..9415b37 100644
--- a/src/main/resources/mapper/data/ResMapper.xml
+++ b/src/main/resources/mapper/data/ResMapper.xml
@@ -18,13 +18,13 @@
                 name = #{name}
             </if>
         </where>
-        order by ns,tab,order_num
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectResAll" resultType="com.lf.server.entity.data.ResEntity">
-        select * from lf.sys_res
+        select * from lf.sys_res order by id;
     </select>
 
     <select id="selectRes" resultType="com.lf.server.entity.data.ResEntity">
diff --git a/src/main/resources/mapper/data/ResOpMapper.xml b/src/main/resources/mapper/data/ResOpMapper.xml
index efe8100..a9c9681 100644
--- a/src/main/resources/mapper/data/ResOpMapper.xml
+++ b/src/main/resources/mapper/data/ResOpMapper.xml
@@ -20,13 +20,13 @@
                 userid = #{userid}
             </if>
         </where>
-
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectResOpAll" resultType="com.lf.server.entity.data.ResOpEntity">
-        select * from lf.sys_res_op
+        select * from lf.sys_res_op order by id;
     </select>
 
     <select id="selectResOp" resultType="com.lf.server.entity.data.ResOpEntity">
diff --git a/src/main/resources/mapper/data/RoleMapper.xml b/src/main/resources/mapper/data/RoleMapper.xml
index 0be7983..9500686 100644
--- a/src/main/resources/mapper/data/RoleMapper.xml
+++ b/src/main/resources/mapper/data/RoleMapper.xml
@@ -20,13 +20,13 @@
                 name = #{name}
             </if>
         </where>
-
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectRoleAll" resultType="com.lf.server.entity.data.RoleEntity">
-        select * from lf.sys_role
+        select * from lf.sys_role order by id;
     </select>
 
     <select id="selectRole" resultType="com.lf.server.entity.data.RoleEntity">
diff --git a/src/main/resources/mapper/data/StyleMapper.xml b/src/main/resources/mapper/data/StyleMapper.xml
index 3102f80..779f309 100644
--- a/src/main/resources/mapper/data/StyleMapper.xml
+++ b/src/main/resources/mapper/data/StyleMapper.xml
@@ -34,7 +34,7 @@
     </select>
 
     <select id="selectStyleAll" resultMap="resultMap" resultType="com.lf.server.entity.data.StyleEntity">
-        select * from lf.sys_style
+        select * from lf.sys_style  order by id;
     </select>
 
     <select id="selectStyle" resultMap="resultMap" resultType="com.lf.server.entity.data.StyleEntity">
diff --git a/src/main/resources/mapper/data/TokenMapper.xml b/src/main/resources/mapper/data/TokenMapper.xml
index fe77abe..f1dfef3 100644
--- a/src/main/resources/mapper/data/TokenMapper.xml
+++ b/src/main/resources/mapper/data/TokenMapper.xml
@@ -32,7 +32,7 @@
     </select>
 
     <select id="selectTokenAll" resultMap="resultMap" resultType="com.lf.server.entity.data.TokenEntity">
-        select * from lf.sys_token
+        select * from lf.sys_token order by id
     </select>
 
     <select id="selectToken" resultMap="resultMap" resultType="com.lf.server.entity.data.TokenEntity">
@@ -51,7 +51,7 @@
         (token,duration,expire,type,ip,create_user,create_time)
        values
         <foreach collection="list"   item="item" index="index" separator=","  >
-            (#{item.token},#{item.duration},#{item.expire},#{item.type},#{item.ip},#{item.createUser} now())
+            (#{item.token},#{item.duration},#{item.expire},#{item.type},#{item.ip},#{item.createUser}, now())
         </foreach>
     </insert>
 
diff --git a/src/main/resources/mapper/data/UsersMapper.xml b/src/main/resources/mapper/data/UsersMapper.xml
index f49259f..5f1c4ad 100644
--- a/src/main/resources/mapper/data/UsersMapper.xml
+++ b/src/main/resources/mapper/data/UsersMapper.xml
@@ -33,7 +33,7 @@
     </select>
 
     <select id="selectUserAll" resultMap="resultMap" resultType="com.lf.server.entity.data.UsersEntity">
-        select * from lf.sys_user
+        select * from lf.sys_user order by id;
     </select>
 
     <select id="selectUser" resultMap="resultMap" resultType="com.lf.server.entity.data.UsersEntity">
diff --git a/src/main/resources/mapper/data/VersionMapper.xml b/src/main/resources/mapper/data/VersionMapper.xml
index ea4c5a6..91493bf 100644
--- a/src/main/resources/mapper/data/VersionMapper.xml
+++ b/src/main/resources/mapper/data/VersionMapper.xml
@@ -20,13 +20,13 @@
                 name = #{name}
             </if>
         </where>
-
+        order by id
         limit #{limit} offset #{offset}
     </select>
 
 
     <select id="selectVersionAll" resultType="com.lf.server.entity.data.VersionEntity">
-        select * from lf.sys_ver
+        select * from lf.sys_ver order by id;
     </select>
 
     <select id="selectVersion" resultType="com.lf.server.entity.data.VersionEntity">

--
Gitblit v1.9.3