diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
index da2bf3cc..c91b2941 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml
@@ -14,13 +14,9 @@
         <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"/>
+        dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
         from sys_dept
         <where>
             <if test="criteria.ids != null and criteria.ids.size() > 0">
@@ -50,14 +46,14 @@
 
     <select id="findByPid" resultMap="BaseResultMap">
         select
-        <include refid="BaseResultMap"/>
+            dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
         from sys_dept
         where pid = #{pid}
     </select>
 
     <select id="findByPidIsNull" resultMap="BaseResultMap">
         select
-        <include refid="BaseResultMap"/>
+            dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
         from sys_dept
         where pid is null
     </select>
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
index ea9cb3cc..489c02d9 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
@@ -17,14 +17,11 @@
         </association>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
-        d.id as dict_id, d.name
-    </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
+        dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
+        d.id as dict_id, d.name
         from sys_dict_detail dd, sys_dict d
         where dd.dict_id = d.id
         <if test="criteria.dictName != null and criteria.dictName != ''">
@@ -38,7 +35,8 @@
 
     <select id="findByDictName" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
+        dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
+        d.id as dict_id, d.name
         from sys_dict_detail dd, sys_dict d
         where dd.dict_id = d.id
         <if test="name != null and name != ''">
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
index 8f53fe08..fbf6d3f5 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml
@@ -22,13 +22,9 @@
         <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"/>
+        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
         from sys_menu
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
@@ -63,7 +59,7 @@
 
     <select id="findByPidOrderByMenuSort" resultMap="BaseResultMap">
         SELECT
-        <include refid="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
         from sys_menu
         WHERE pid = #{pid}
         ORDER BY menu_sort
@@ -71,7 +67,7 @@
 
     <select id="findByPidIsNullOrderByMenuSort" resultMap="BaseResultMap">
         SELECT
-        <include refid="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
         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 afd274e4..a56b2f91 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml
@@ -1,7 +1,6 @@
 <?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.RoleDeptMapper">
-
     <insert id="insertData">
         insert into sys_roles_depts (role_id, dept_id)
         values
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
index e57ad716..60d2c0ce 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
@@ -22,21 +22,22 @@
         </collection>
     </resultMap>
 
-    <sql id="Base_Column_List">
+
+    <select id="queryAll" resultType="cn.odboy.model.system.domain.Role">
+        select role_id as id, name, level
+        from sys_role order by level
+    </select>
+
+    <select id="findAll" resultMap="BaseResultMap">
+        select role.*,
+        dept.dept_id as dept_id, dept.name as dept_name,
+        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
+        from (
+        select
         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
-    </sql>
-
-    <sql id="Dept_Column_List">
-        dept.dept_id as dept_id, dept.name as dept_name
-    </sql>
-
-    <sql id="Where_sql">
+        from sys_role role
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
                 and (
@@ -48,22 +49,6 @@
                 and role.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
             </if>
         </where>
-    </sql>
-
-    <select id="queryAll" resultType="cn.odboy.model.system.domain.Role">
-        select role_id as id, name, level
-        from sys_role order by level
-    </select>
-
-    <select id="findAll" resultMap="BaseResultMap">
-        select role.*,
-        <include refid="Dept_Column_List"/>,
-        <include refid="Menu_Column_List"/>
-        from (
-        select
-        <include refid="Base_Column_List"/>
-        from sys_role role
-        <include refid="Where_sql"/>
         order by role.level
         <if test="criteria.offset != null">
             limit #{criteria.offset}, #{criteria.size}
@@ -79,7 +64,17 @@
     <select id="countAll" resultType="java.lang.Long">
         select count(*)
         from sys_role role
-        <include refid="Where_sql"/>
+        <where>
+            <if test="criteria.blurry != null and criteria.blurry != ''">
+                and (
+                role.name like concat('%', #{criteria.blurry}, '%')
+                or role.description like concat('%', #{criteria.blurry}, '%')
+                )
+            </if>
+            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
+                and role.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            </if>
+        </where>
     </select>
 
     <select id="findByName" resultType="cn.odboy.model.system.domain.Role">
@@ -89,9 +84,11 @@
 
     <select id="findById" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>,
-        <include refid="Dept_Column_List"/>,
-        <include refid="Menu_Column_List"/>
+        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,
+        dept.dept_id as dept_id, dept.name as dept_name,
+        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
         from sys_role role
         left join sys_roles_menus srm on role.role_id = srm.role_id
         left join sys_menu menu on menu.menu_id = srm.menu_id
@@ -102,9 +99,11 @@
 
     <select id="findByUserId" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>,
-        <include refid="Dept_Column_List"/>,
-        <include refid="Menu_Column_List"/>
+        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,
+        dept.dept_id as dept_id, dept.name as dept_name,
+        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
         from sys_role role
         left join sys_roles_menus srm on role.role_id = srm.role_id
         left join sys_menu menu on menu.menu_id = srm.menu_id
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
index 6377830a..3f906a8d 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml
@@ -1,7 +1,6 @@
 <?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.RoleMenuMapper">
-
     <insert id="insertData">
         insert into sys_roles_menus (role_id, menu_id)
         values
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
index 7fc98632..69a975bc 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml
@@ -1,7 +1,6 @@
 <?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.UserJobMapper">
-
     <insert id="insertData">
         insert into sys_users_jobs (user_id, job_id)
         values
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
index 4e9d1657..01d9e0d9 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
@@ -35,24 +35,20 @@
         </collection>
     </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
-    </sql>
-
-    <sql id="Job_Column_List">
-        j.job_id as job_id, j.name as job_name
-    </sql>
-
-    <sql id="Role_Column_List">
+    <select id="findAll" resultMap="BaseResultMap">
+        select u.*,
+        j.id as job_id, j.name as job_name,
         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="Whrer_Sql">
+        from (
+        select
+        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
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
         <where>
             <if test="criteria.id != null">
                 and u.user_id = #{criteria.id}
@@ -77,25 +73,13 @@
                 and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
             </if>
         </where>
-    </sql>
-
-    <select id="findAll" resultMap="BaseResultMap">
-        select u.*,
-        <include refid="Job_Column_List"/>,
-        <include refid="Role_Column_List"/>
-        from (
-        select
-        <include refid="Base_Column_List"/>
-        from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
-        <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.job_id
+        left join sys_job j on suj.job_id = j.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
@@ -104,13 +88,41 @@
     <select id="countAll" resultType="java.lang.Long">
         select count(*)
         from sys_user u
-        <include refid="Whrer_Sql"/>
+        <where>
+            <if test="criteria.id != null">
+                and u.user_id = #{criteria.id}
+            </if>
+            <if test="criteria.enabled != null">
+                and u.enabled = #{criteria.enabled}
+            </if>
+            <if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
+                and u.dept_id in
+                <foreach collection="criteria.deptIds" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
+            <if test="criteria.blurry != null and criteria.blurry != ''">
+                and (
+                u.username like concat('%', #{criteria.blurry}, '%')
+                or u.nick_name like concat('%', #{criteria.blurry}, '%')
+                or u.email like concat('%', #{criteria.blurry}, '%')
+                )
+            </if>
+            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
+                and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            </if>
+        </where>
     </select>
 
     <select id="findByUsername" resultMap="BaseResultMap">
         select
         u.password user_password, u.is_admin user_is_admin,
-        <include refid="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
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.username = #{username}
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
index 3ea5a8c3..0714f032 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml
@@ -1,7 +1,6 @@
 <?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.UserRoleMapper">
-
     <insert id="insertData">
         insert into sys_users_roles (user_id, role_id)
         values
diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java
index 3db6ea8e..38f729cd 100644
--- a/cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java
+++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java
@@ -12,8 +12,6 @@ import java.util.List;
 
 @Mapper
 public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
-
-    IPage<LocalStorage> findAll(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
-
-    List<LocalStorage> findAll(@Param("criteria") LocalStorageQueryCriteria criteria);
+    IPage<LocalStorage> selectByPage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
+    List<LocalStorage> selectByPage(@Param("criteria") LocalStorageQueryCriteria criteria);
 }
diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java
index 3219da0f..0b360b71 100644
--- a/cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java
+++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java
@@ -36,12 +36,12 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
 
     @Override
     public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(localStorageMapper.findAll(criteria, page));
+        return PageUtil.toPage(localStorageMapper.selectByPage(criteria, page));
     }
 
     @Override
     public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria) {
-        return localStorageMapper.findAll(criteria);
+        return localStorageMapper.selectByPage(criteria);
     }
 
     @Override
diff --git a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml b/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml
index 6f136645..93a8ce9b 100644
--- a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml
+++ b/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml
@@ -1,7 +1,7 @@
 <?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.mapper.LocalStorageMapper">
-    <select id="findAll" resultType="cn.odboy.model.tools.domain.LocalStorage">
+    <select id="selectByPage" resultType="cn.odboy.model.tools.domain.LocalStorage">
         select
         *
         from tool_local_storage