From 8e91d3840800aad5400f07bbd9a702a56c1d96db Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Mon, 24 Mar 2025 21:07:50 +0800
Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DeptMapper.xml  | 46 +++++++------
 .../src/main/resources/mapper/MenuMapper.xml  | 46 ++++++++++---
 .../main/resources/mapper/RoleDeptMapper.xml  |  3 +-
 .../src/main/resources/mapper/RoleMapper.xml  | 23 ++-----
 .../main/resources/mapper/RoleMenuMapper.xml  |  6 +-
 .../main/resources/mapper/UserJobMapper.xml   |  3 +-
 .../src/main/resources/mapper/UserMapper.xml  | 65 ++++++-------------
 .../main/resources/mapper/UserRoleMapper.xml  |  3 +-
 8 files changed, 94 insertions(+), 101 deletions(-)

diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
index 286c20d8..da2bf3cc 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.modules.system.mapper.DeptMapper">
-    <select id="findAll" resultType="cn.odboy.model.system.domain.Dept">
+    <resultMap id="BaseResultMap" type="cn.odboy.model.system.domain.Dept">
+        <id column="dept_id" property="id"/>
+        <result column="dept_sort" property="deptSort"/>
+        <result column="name" property="name"/>
+        <result column="enabled" property="enabled"/>
+        <result column="pid" property="pid"/>
+        <result column="sub_count" property="subCount"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="BaseResultMap">
+        dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
+    </sql>
+
+    <select id="findAll" resultMap="BaseResultMap">
         select
-        *
+        <include refid="BaseResultMap"/>
         from sys_dept
         <where>
             <if test="criteria.ids != null and criteria.ids.size() > 0">
@@ -31,34 +48,23 @@
         order by dept_sort
     </select>
 
-    <select id="findByPid" resultType="cn.odboy.model.system.domain.Dept">
+    <select id="findByPid" resultMap="BaseResultMap">
         select
-        *
+        <include refid="BaseResultMap"/>
         from sys_dept
         where pid = #{pid}
     </select>
 
-    <select id="findByPidIsNull" resultType="cn.odboy.model.system.domain.Dept">
+    <select id="findByPidIsNull" resultMap="BaseResultMap">
         select
-       *
+        <include refid="BaseResultMap"/>
         from sys_dept
         where pid is null
     </select>
 
     <select id="findByRoleId" resultType="cn.odboy.model.system.domain.Dept">
-        select d.dept_id as id,
-               d.name,
-               d.pid,
-               d.sub_count,
-               d.create_time,
-               d.update_time,
-               d.create_by,
-               d.update_by,
-               d.enabled,
-               d.dept_sort
-        from sys_dept d,
-             sys_roles_depts r
-        where d.dept_id = r.dept_id
-          and r.role_id = #{roleId}
+        select d.dept_id as id, d.name, d.pid, d.sub_count, d.create_time, d.update_time, d.create_by, d.update_by, d.enabled, d.dept_sort
+        from sys_dept d, sys_roles_depts r
+        where d.dept_id = r.dept_id and r.role_id = #{roleId}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
index 460efc9d..8f53fe08 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.modules.system.mapper.MenuMapper">
-    <select id="findAll" resultType="cn.odboy.model.system.domain.Menu">
+    <resultMap id="BaseResultMap" type="cn.odboy.model.system.domain.Menu">
+        <id column="menu_id" property="id"/>
+        <result column="title" property="title"/>
+        <result column="name" property="componentName"/>
+        <result column="menu_sort" property="menuSort"/>
+        <result column="component" property="component"/>
+        <result column="path" property="path"/>
+        <result column="type" property="type"/>
+        <result column="permission" property="permission"/>
+        <result column="icon" property="icon"/>
+        <result column="cache" property="cache"/>
+        <result column="hidden" property="hidden"/>
+        <result column="pid" property="pid"/>
+        <result column="sub_count" property="subCount"/>
+        <result column="i_frame" property="iFrame"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, i_frame, create_by, update_by, create_time, update_time
+    </sql>
+
+    <select id="findAll" resultMap="BaseResultMap">
         select
-        *
+        <include refid="Base_Column_List"/>
         from sys_menu
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
                 and (
-                title like concat('%',#{criteria.blurry},'%')
-                or name like concat('%',#{criteria.blurry},'%')
-                or permission like concat('%',#{criteria.blurry},'%')
+                    title like concat('%',#{criteria.blurry},'%')
+                    or name like concat('%',#{criteria.blurry},'%')
+                    or permission like concat('%',#{criteria.blurry},'%')
                 )
             </if>
             <if test="criteria.pidIsNull != null">
@@ -26,7 +51,7 @@
         order by menu_sort
     </select>
 
-    <select id="findByRoleIdsAndTypeNot" resultType="cn.odboy.model.system.domain.Menu">
+    <select id="findByRoleIdsAndTypeNot" resultMap="BaseResultMap">
         SELECT m.* FROM sys_menu m, sys_roles_menus r
         WHERE m.menu_id = r.menu_id AND r.role_id IN
         <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
@@ -36,16 +61,17 @@
         order by m.menu_sort
     </select>
 
-    <select id="findByPidOrderByMenuSort" resultType="cn.odboy.model.system.domain.Menu">
+    <select id="findByPidOrderByMenuSort" resultMap="BaseResultMap">
         SELECT
-       *
+        <include refid="Base_Column_List"/>
         from sys_menu
         WHERE pid = #{pid}
         ORDER BY menu_sort
     </select>
 
-    <select id="findByPidIsNullOrderByMenuSort" resultType="cn.odboy.model.system.domain.Menu">
-        SELECT *
+    <select id="findByPidIsNullOrderByMenuSort" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
         from sys_menu
         where pid is null
         order by menu_sort
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml
index 00ef7804..afd274e4 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml
@@ -11,8 +11,7 @@
     </insert>
 
     <delete id="deleteByRoleId">
-        delete
-        from sys_roles_depts
+        delete from sys_roles_depts
         where role_id = #{roleId}
     </delete>
 
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
index ba7f4c63..e57ad716 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
@@ -23,26 +23,17 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        role
-        .
-        role_id
-        as role_role_id, role.name as role_name, role.data_scope as role_data_scope,
+        role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope,
         role.level as role_level, role.description as role_description, role.create_by as role_create_by,
         role.update_by as role_update_by, role.create_time as role_create_time, role.update_time as role_update_time
     </sql>
 
     <sql id="Menu_Column_List">
-        menu
-        .
-        menu_id
-        as menu_id, menu.title as menu_title, menu.permission as menu_permission
+        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
     </sql>
 
     <sql id="Dept_Column_List">
-        dept
-        .
-        dept_id
-        as dept_id, dept.name as dept_name
+        dept.dept_id as dept_id, dept.name as dept_name
     </sql>
 
     <sql id="Where_sql">
@@ -61,8 +52,7 @@
 
     <select id="queryAll" resultType="cn.odboy.model.system.domain.Role">
         select role_id as id, name, level
-        from sys_role
-        order by level
+        from sys_role order by level
     </select>
 
     <select id="findAll" resultMap="BaseResultMap">
@@ -80,7 +70,7 @@
         </if>
         ) role
         left join sys_roles_menus srm on role.role_role_id = srm.role_id
-        left join sys_menu menu on menu.menu_id = srm.menu_id
+        left join  sys_menu menu on menu.menu_id = srm.menu_id
         left join sys_roles_depts srd on role.role_role_id = srd.role_id
         left join sys_dept dept on dept.dept_id = srd.dept_id
         order by role.role_level
@@ -93,8 +83,7 @@
     </select>
 
     <select id="findByName" resultType="cn.odboy.model.system.domain.Role">
-        select role_id as id
-        from sys_role
+        select role_id as id from sys_role
         where name = #{name}
     </select>
 
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
index 6a2367e8..6377830a 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
@@ -11,8 +11,7 @@
     </insert>
 
     <delete id="deleteByRoleId">
-        delete
-        from sys_roles_menus
+        delete from sys_roles_menus
         where role_id = #{roleId}
     </delete>
 
@@ -25,8 +24,7 @@
     </delete>
 
     <delete id="deleteByMenuId">
-        delete
-        from sys_roles_menus
+        delete from sys_roles_menus
         where menu_id = #{menuId}
     </delete>
 </mapper>
\ No newline at end of file
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
index e36a3d83..7fc98632 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
@@ -11,8 +11,7 @@
     </insert>
 
     <delete id="deleteByUserId">
-        delete
-        from sys_users_jobs
+        delete from sys_users_jobs
         where user_id = #{userId}
     </delete>
 
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
index 24d60335..4e9d1657 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
@@ -24,7 +24,7 @@
             <result column="dept_name" property="name"/>
         </association>
         <collection property="jobs" ofType="cn.odboy.model.system.domain.Job">
-            <id column="id" property="id"/>
+            <id column="job_id" property="id"/>
             <result column="job_name" property="name"/>
         </collection>
         <collection property="roles" ofType="cn.odboy.model.system.domain.Role">
@@ -36,31 +36,23 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        u
-        .
-        user_id
-        as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
-        u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
-        u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
-        u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
-        u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time,
-        d.dept_id as dept_id, d.name as dept_name
+        u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
+           u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
+           u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
+           u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
+           u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time,
+           d.dept_id as dept_id, d.name as dept_name
     </sql>
 
     <sql id="Job_Column_List">
-        j
-        .
-        id, j.name as job_name
+        j.job_id as job_id, j.name as job_name
     </sql>
 
     <sql id="Role_Column_List">
-        r
-        .
-        role_id
-        as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
+        r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
     </sql>
 
-    <sql id="WHERE_SQL">
+    <sql id="Whrer_Sql">
         <where>
             <if test="criteria.id != null">
                 and u.user_id = #{criteria.id}
@@ -96,14 +88,14 @@
         <include refid="Base_Column_List"/>
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
-        <include refid="WHERE_SQL"/>
+        <include refid="Whrer_Sql"/>
         order by u.user_id desc
         <if test="criteria.offset != null">
             limit #{criteria.offset}, #{criteria.size}
         </if>
         ) u
         left join sys_users_jobs suj on u.user_user_id = suj.user_id
-        left join sys_job j on suj.job_id = j.id
+        left join sys_job j on suj.job_id = j.job_id
         left join sys_users_roles sur on u.user_user_id = sur.user_id
         left join sys_role r on sur.role_id = r.role_id
         order by u.user_user_id desc
@@ -112,7 +104,7 @@
     <select id="countAll" resultType="java.lang.Long">
         select count(*)
         from sys_user u
-        <include refid="WHERE_SQL"/>
+        <include refid="Whrer_Sql"/>
     </select>
 
     <select id="findByUsername" resultMap="BaseResultMap">
@@ -125,45 +117,30 @@
     </select>
 
     <select id="findByEmail" resultType="cn.odboy.model.system.domain.User">
-        select user_id as id, username
-        from sys_user
+        select user_id as id, username from sys_user
         where email = #{email}
     </select>
 
     <select id="findByPhone" resultType="cn.odboy.model.system.domain.User">
-        select user_id as id, username
-        from sys_user
+        select user_id as id, username from sys_user
         where phone = #{phone}
     </select>
 
     <select id="findByRoleId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.user_id as id, u.username
-        FROM sys_user u,
-             sys_users_roles r
-        WHERE u.user_id = r.user_id
-          AND r.role_id = #{roleId}
+        SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles r
+        WHERE u.user_id = r.user_id AND r.role_id = #{roleId}
         group by u.user_id
     </select>
 
     <select id="findByRoleDeptId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.*
-        FROM sys_user u,
-             sys_users_roles r,
-             sys_roles_depts d
-        WHERE u.user_id = r.user_id
-          AND r.role_id = d.role_id
-          AND d.dept_id = #{deptId}
+        SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d
+        WHERE u.user_id = r.user_id AND r.role_id = d.role_id AND d.dept_id = #{deptId}
         group by u.user_id
     </select>
 
     <select id="findByMenuId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.user_id as id, u.username
-        FROM sys_user u,
-             sys_users_roles ur,
-             sys_roles_menus rm
-        WHERE u.user_id = ur.user_id
-          AND ur.role_id = rm.role_id
-          AND rm.menu_id = #{menuId}
+        SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles ur, sys_roles_menus rm
+        WHERE u.user_id = ur.user_id AND ur.role_id = rm.role_id AND rm.menu_id = #{menuId}
         group by u.user_id
     </select>
 
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
index e9709099..3ea5a8c3 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
@@ -11,8 +11,7 @@
     </insert>
 
     <delete id="deleteByUserId">
-        delete
-        from sys_users_roles
+        delete from sys_users_roles
         where user_id = #{userId}
     </delete>