优化 SysDeptServiceImpl.java 中方法的格式，简化代码结构

bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -10,10 +10,8 @@
         <result property="companyId" column="company_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
-        <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
-        <result property="avatar" column="avatar"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
@@ -58,8 +56,6 @@
                u.dept_id as companyId,
                u.user_name,
                u.nick_name,
-               u.email,
-               u.avatar,
                u.phonenumber,
                u.password,
                u.sex,
@@ -94,7 +90,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status,
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
         d.leader,r.role_id,
         r.role_name,
@@ -174,7 +170,7 @@
 <!--    </select>-->
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.is_built_in
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
         from sys_user 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
@@ -191,7 +187,7 @@
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.is_built_in
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
         from sys_user 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
@@ -217,10 +213,7 @@
         <include refid="selectUserVo"/>
         where u.del_flag = '0'AND u.phonenumber = #{phoneNumber}  AND sd.del_flag = '0' AND sd.status = '0'
     </select>
-    <select id="selectUserByEmail" resultMap="SysUserResult">
+
-        <include refid="selectUserVo"/>
-        where u.del_flag = '0'AND u.email = #{email}
-    </select>
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.user_id = #{userId}
@@ -248,15 +241,9 @@
           and del_flag = '0' limit 1
     </select>
 
-    <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-        select user_id, email
-        from sys_user
-        where email = #{email}
-          and del_flag = '0' limit 1
-    </select>
 
     <select id="getList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status,
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
         d.leader,r.role_id,
         r.role_name,
@@ -310,8 +297,6 @@
         <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="userName != null and userName != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
-        <if test="email != null and email != ''">email,</if>
-        <if test="avatar != null and avatar != ''">avatar,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
         <if test="password != null and password != ''">password,</if>
@@ -328,8 +313,6 @@
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="userName != null and userName != ''">#{userName},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
-        <if test="email != null and email != ''">#{email},</if>
-        <if test="avatar != null and avatar != ''">#{avatar},</if>
         <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
         <if test="sex != null and sex != ''">#{sex},</if>
         <if test="password != null and password != ''">#{password},</if>
@@ -350,10 +333,8 @@
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
-            <if test="email != null ">email = #{email},</if>
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
-            <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
@@ -374,12 +355,6 @@
         where user_id = #{userId}
     </update>
 
-    <update id="updateUserAvatar" parameterType="SysUser">
-        update sys_user
-        set avatar = #{avatar}
-        where user_name = #{userName}
-    </update>
-
     <update id="resetUserPwd" parameterType="SysUser">
         update sys_user
         set password = #{password}