no message

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -134,7 +134,8 @@ public interface SysUserMapper
      * @param phoneNumber 手机号码
      * @return 结果
      */
-    public SysUser checkPhoneUnique(String phoneNumber);
+    public SysUser checkPhoneUnique(@Param("phoneNumber") String phoneNumber ,
+                                    @Param("tenantId") Long tenantId);
 
     /**
      * 校验email是否唯一

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -228,7 +228,7 @@ public class SysUserServiceImpl implements ISysUserService
     public String checkPhoneUnique(SysUser user)
     {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber(),user.getTenantId());
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -1,287 +1,376 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.ezhizao.project.system.mapper.SysUserMapper">
 
-	<resultMap type="SysUser" id="SysUserResult">
-		<id     property="userId"       column="user_id"      />
-		<result property="deptId"       column="dept_id"      />
-		<result property="tenantId"       column="tenant_id"      />
-		<result property="orgName"       column="org_name"      />
-		<result property="deptId"       column="dept_id"      />
-		<result property="snmsUserId"       column="snms_user_id"      />
-		<result property="userName"     column="user_name"    />
-		<result property="userType"     column="user_type"    />
-		<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"     />
-		<result property="loginIp"      column="login_ip"     />
-		<result property="loginDate"    column="login_date"   />
-		<result property="createBy"     column="create_by"    />
-		<result property="createTime"   column="create_time"  />
-		<result property="updateBy"     column="update_by"    />
-		<result property="updateTime"   column="update_time"  />
-		<result property="remark"       column="remark"       />
-		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-		<collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
-	</resultMap>
+    <resultMap type="SysUser" id="SysUserResult">
+        <id property="userId" column="user_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="orgName" column="org_name"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="snmsUserId" column="snms_user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userType" column="user_type"/>
+        <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"/>
+        <result property="loginIp" column="login_ip"/>
+        <result property="loginDate" column="login_date"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
+        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
+    </resultMap>
 
-	<resultMap id="deptResult" type="SysDept">
-		<id     property="deptId"    column="dept_id"     />
-		<result property="parentId"  column="parent_id"   />
-		<result property="deptName"  column="dept_name"   />
-		<result property="ancestors" column="ancestors"   />
-		<result property="orderNum"  column="order_num"   />
-		<result property="leader"    column="leader"      />
-		<result property="status"    column="dept_status" />
-	</resultMap>
+    <resultMap id="deptResult" type="SysDept">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
+    </resultMap>
 
-	<resultMap id="RoleResult" type="SysRole">
-		<id     property="roleId"       column="role_id"        />
-		<result property="roleName"     column="role_name"      />
-		<result property="roleKey"      column="role_key"       />
-		<result property="roleSort"     column="role_sort"      />
-		<result property="dataScope"     column="data_scope"    />
-		<result property="status"       column="role_status"    />
-	</resultMap>
+    <resultMap id="RoleResult" type="SysRole">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="dataScope" column="data_scope"/>
+        <result property="status" column="role_status"/>
+    </resultMap>
 
-	<sql id="selectUserVo">
-		select u.user_id,u.dept_id,u.snms_user_id,u.user_type,u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-			   d.dept_id, d.parent_id, d.ancestors, 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 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_role r on r.role_id = ur.role_id
-	</sql>
+    <sql id="selectUserVo">
+        select u.user_id,
+               u.dept_id,
+               u.snms_user_id,
+               u.user_type,
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               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 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_role r on r.role_id = ur.role_id
+    </sql>
 
-	<sql id="selectUserTenantVo">
-		select u.user_id,ut.dept_id,ut.tenant_id,t.org_name,u.snms_user_id,u.user_type,u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-			   d.dept_id, d.parent_id, d.ancestors, 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 u
-		    	 left join biz_user_tenant ut ON ut.user_id = u.user_id
-		         left join biz_tenant t on t.id = ut.tenant_id
-				 left join sys_dept d on ut.dept_id = d.dept_id
-				 left join sys_user_role ur on u.user_id = ur.user_id
-				 left join sys_role r on r.role_id = ur.role_id
-	</sql>
+    <sql id="selectUserTenantVo">
+        select u.user_id,
+               ut.dept_id,
+               ut.tenant_id,
+               t.org_name,
+               u.snms_user_id,
+               u.user_type,
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               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 u
+                 left join biz_user_tenant ut ON ut.user_id = u.user_id
+                 left join biz_tenant t on t.id = ut.tenant_id
+                 left join sys_dept d on ut.dept_id = d.dept_id
+                 left join sys_user_role 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.snms_user_id,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, 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 u
-		left join sys_dept 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}
-		</if>
-		<if test="tenantId != null ">
-			AND u.user_id IN (SELECT user_id FROM biz_user_tenant WHERE deleted = 0 AND tenant_id = #{tenantId} )
-		</if>
-		<if test="snmsUserId != null and snmsUserId != 0">
-			AND u.snms_user_id = #{snmsUserId}
-		</if>
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="keyword != null and keyword != ''">
-			AND (u.user_name like concat('%', #{keyword}, '%') or u.nick_name like concat('%', #{keyword}, '%'))
-		</if>
-		<if test="status != null and status != ''">
-			AND u.status = #{status}
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</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) ))
-		</if>
-		-->
-		<if test="deptId != null and deptId != 0">
-		   AND u.user_id IN (SELECT user_id FROM biz_user_tenant WHERE deleted = 0 AND dept_id = #{deptId} OR dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ) )
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
+    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+        select u.user_id,u.snms_user_id,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+        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 u
+        left join sys_dept 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}
+        </if>
+        <if test="tenantId != null ">
+            AND u.user_id IN (SELECT user_id FROM biz_user_tenant WHERE deleted = 0 AND tenant_id = #{tenantId} )
+        </if>
+        <if test="snmsUserId != null and snmsUserId != 0">
+            AND u.snms_user_id = #{snmsUserId}
+        </if>
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="keyword != null and keyword != ''">
+            AND (u.user_name like concat('%', #{keyword}, '%') or u.nick_name like concat('%', #{keyword}, '%'))
+        </if>
+        <if test="status != null and status != ''">
+            AND u.status = #{status}
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </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) ))
+        </if>
+        -->
+        <if test="deptId != null and deptId != 0">
+            AND u.user_id IN (SELECT user_id FROM biz_user_tenant WHERE deleted = 0 AND dept_id = #{deptId} OR dept_id
+            IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ) )
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 
-	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-		select distinct u.user_id,u.snms_user_id,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-		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
-		left join sys_role r on r.role_id = ur.role_id
-		where u.del_flag = '0' and r.role_id = #{roleId}
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
+    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+        select distinct u.user_id,u.snms_user_id,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,
+        u.create_time
+        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
+        left join sys_role r on r.role_id = ur.role_id
+        where u.del_flag = '0' and r.role_id = #{roleId}
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 
-	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-		select distinct u.user_id,u.snms_user_id,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-		from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
-		left join biz_user_tenant ut on ut.user_id = u.user_id
-		left join sys_user_role 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 u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
+    <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+        select distinct u.user_id,u.snms_user_id,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,
+        u.create_time
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
+        left join biz_user_tenant ut on ut.user_id = u.user_id
+        left join sys_user_role 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 u inner join sys_user_role ur on u.user_id = ur.user_id and
+        ur.role_id = #{roleId})
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 
-	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
-	</select>
-	<select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
-		where u.user_name = #{phoneNumber} and u.del_flag = '0'
-		and u.resignation_time = ''
-	</select>
+    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_name = #{userName} and u.del_flag = '0'
+    </select>
+    <select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_name = #{phoneNumber} and u.del_flag = '0'
+        and u.resignation_time = ''
+    </select>
 
-	<select id="selectUserByUserNameAndTenantId" parameterType="String" resultMap="SysUserResult">
-		<include refid="selectUserTenantVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0' and ut.tenant_id = #{tenantId} and ut.deleted = 0
-	</select>
+    <select id="selectUserByUserNameAndTenantId" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserTenantVo"/>
+        where u.user_name = #{userName} and u.del_flag = '0' and ut.tenant_id = #{tenantId} and ut.deleted = 0
+    </select>
 
-	<select id="selectUserByPhoneNumberAndTenantId" parameterType="String" resultMap="SysUserResult">
-		<include refid="selectUserTenantVo"/>
-		where u.phonenumber = #{phoneNumber} and u.del_flag = '0' and ut.tenant_id = #{tenantId} and ut.deleted = 0
-	</select>
+    <select id="selectUserByPhoneNumberAndTenantId" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserTenantVo"/>
+        where u.phonenumber = #{phoneNumber} and u.del_flag = '0' and ut.tenant_id = #{tenantId} and ut.deleted = 0
+    </select>
 
-	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
-	</select>
+    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_id = #{userId}
+    </select>
 
-	<select id="checkUserNameUnique"  resultMap="SysUserResult">
-		select user_id, user_name from sys_user where user_name = #{userName} and resignation_time = '' and del_flag = '0'
-		limit 1
-	</select>
+    <select id="checkUserNameUnique" resultMap="SysUserResult">
+        select user_id, user_name
+        from sys_user
+        where user_name = #{userName}
+          and resignation_time = ''
+          and del_flag = '0' limit 1
+    </select>
 
-	<select id="selectUserListByIds" parameterType="Long" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
-		where u.user_id in
-		<foreach collection="list" item="userId" open="(" separator="," close=")">
-			#{userId}
-		</foreach>
-	</select>
+    <select id="selectUserListByIds" parameterType="Long" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_id in
+        <foreach collection="list" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </select>
 
-	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from sys_user where user_name = #{userName} and resignation_time = '' and del_flag = '0' limit 1
-	</select>
+    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
+        select user_id, user_name
+        from sys_user
+        where user_name = #{userName}
+          and resignation_time = ''
+          and del_flag = '0' limit 1
+    </select>
 
 
-	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
-	</select>
+    <select id="checkPhoneUnique" resultMap="SysUserResult">
+        select t1.user_id, t1.phonenumber
+        from sys_user t1
+        left join biz_user_tenant t2 on t1.user_id = t2.user_id
+        where t1.phonenumber = #{phoneNumber}
+          and t1.del_flag = '0'
+          and t2.deleted = 0
+          and t2.tenant_id = #{tenantId}
+          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="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
+        select user_id, email
+        from sys_user
+        where email = #{email}
+          and del_flag = '0' limit 1
+    </select>
 
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
-		insert into sys_user(
-		<if test="userId != null and userId != 0">user_id,</if>
-		<if test="snmsUserId != null and snmsUserId != 0">snms_user_id,</if>
-		<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>
-		<if test="status != null and status != ''">status,</if>
-		<if test="createBy != null and createBy != ''">create_by,</if>
-		<if test="remark != null and remark != ''">remark,</if>
-		<if test="userType != null and userType != ''">user_type,</if>
-		create_time
-		)values(
-		<if test="userId != null and userId != ''">#{userId},</if>
-		<if test="snmsUserId != null and snmsUserId != ''">#{snmsUserId},</if>
-		<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>
-		<if test="status != null and status != ''">#{status},</if>
-		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="userType != null and userType != ''">#{userType},</if>
-		sysdate()
-		)
-	</insert>
+    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+        insert into sys_user(
+        <if test="userId != null and userId != 0">user_id,</if>
+        <if test="snmsUserId != null and snmsUserId != 0">snms_user_id,</if>
+        <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>
+        <if test="status != null and status != ''">status,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="userType != null and userType != ''">user_type,</if>
+        create_time
+        )values(
+        <if test="userId != null and userId != ''">#{userId},</if>
+        <if test="snmsUserId != null and snmsUserId != ''">#{snmsUserId},</if>
+        <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>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="userType != null and userType != ''">#{userType},</if>
+        sysdate()
+        )
+    </insert>
 
-	<update id="updateUser" parameterType="SysUser">
-		update sys_user
-		<set>
-			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
-			<if test="snmsUserId != null and snmsUserId != 0">snms_user_id = #{snmsUserId},</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>
-			<if test="loginDate != null">login_date = #{loginDate},</if>
-			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			<if test="remark != null">remark = #{remark},</if>
-			update_time = sysdate()
-		</set>
-		where user_id = #{userId}
-	</update>
+    <update id="updateUser" parameterType="SysUser">
+        update sys_user
+        <set>
+            <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+            <if test="snmsUserId != null and snmsUserId != 0">snms_user_id = #{snmsUserId},</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>
+            <if test="loginDate != null">login_date = #{loginDate},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where user_id = #{userId}
+    </update>
 
-	<update id="updateUserStatus" parameterType="SysUser">
-		update sys_user set status = #{status} where user_id = #{userId}
-	</update>
+    <update id="updateUserStatus" parameterType="SysUser">
+        update sys_user
+        set status = #{status}
+        where user_id = #{userId}
+    </update>
 
-	<update id="updateUserAvatar" parameterType="SysUser">
-		update sys_user set avatar = #{avatar} where user_name = #{userName}
-	</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} where user_name = #{userName}
-	</update>
+    <update id="resetUserPwd" parameterType="SysUser">
+        update sys_user
+        set password = #{password}
+        where user_name = #{userName}
+    </update>
 
-	<delete id="deleteUserById" parameterType="Long">
-		update sys_user set del_flag = '2' where user_id = #{userId}
-	</delete>
+    <delete id="deleteUserById" parameterType="Long">
+        update sys_user
+        set del_flag = '2'
+        where user_id = #{userId}
+    </delete>
 
-	<delete id="deleteUserByIds" parameterType="Long">
-		update sys_user set del_flag = '2' where user_id in
-		<foreach collection="array" item="userId" open="(" separator="," close=")">
-			#{userId}
-		</foreach>
-	</delete>
+    <delete id="deleteUserByIds" parameterType="Long">
+        update sys_user set del_flag = '2' where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
 
 </mapper>