用户逻辑修改

base-common/src/main/java/com/ozs/common/core/controller/BaseController.java

@@ -179,9 +179,9 @@ public class BaseController
     /**
      * 获取登录用户id
      */
-    public Long getUserId()
+    public Long getId()
     {
-        return getLoginUser().getUserId();
+        return getLoginUser().getId();
     }
 
     /**

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -21,10 +21,14 @@ public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /** 主键ID */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
-
+    private Long id;
+  
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private String userId;
+    
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
@@ -43,7 +47,7 @@ public class SysUser extends BaseEntity
 
     /** 手机号码 */
     @Excel(name = "手机号码")
-    private String phonenumber;
+    private String phoneNum;
 
     /** 用户性别 */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
@@ -57,10 +61,10 @@ public class SysUser extends BaseEntity
 
     /** 帐号状态（0正常 1停用） */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
-    private String status;
+    private Integer status;
 
     /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
+    private Integer delFlag;
 
     /** 最后登录IP */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
@@ -94,29 +98,37 @@ public class SysUser extends BaseEntity
 
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public SysUser(Long userId)
     {
-        this.userId = userId;
+        this.id = id;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(Long id)
     {
-        return userId != null && 1L == userId;
+        return id != null && 1L == id;
     }
 
     public Long getDeptId()
@@ -167,14 +179,13 @@ public class SysUser extends BaseEntity
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
+    public String getPhoneNum()
     {
-        return phonenumber;
+        return phoneNum;
     }
 
-    public void setPhonenumber(String phonenumber)
-    {
-        this.phonenumber = phonenumber;
+    public void setPhoneNum(String phoneNum) {
+        this.phoneNum = phoneNum;
     }
 
     public String getSex()
@@ -207,22 +218,22 @@ public class SysUser extends BaseEntity
         this.password = password;
     }
 
-    public String getStatus()
+    public Integer getStatus()
     {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public Integer getDelFlag()
     {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(Integer delFlag)
     {
         this.delFlag = delFlag;
     }
@@ -300,12 +311,13 @@ public class SysUser extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("userId", getUserId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
             .append("nickName", getNickName())
             .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
+            .append("phoneNum", getPhoneNum())
             .append("sex", getSex())
             .append("avatar", getAvatar())
             .append("password", getPassword())

base-common/src/main/java/com/ozs/common/core/domain/model/LoginUser.java

@@ -19,7 +19,12 @@ public class LoginUser implements UserDetails
     /**
      * 用户ID
      */
-    private Long userId;
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
 
     /**
      * 部门ID
@@ -71,13 +76,21 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
-    public Long getUserId()
+    public Long getId()
     {
-        return userId;
+        return id;
     }
 
-    public void setUserId(Long userId)
+    public void setId(Long id)
     {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
 
@@ -111,9 +124,10 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    public LoginUser(Long id,String userId, Long deptId, SysUser user, Set<String> permissions)
     {
-        this.userId = userId;
+        this.id = id;
+        this.userId=userId;
         this.deptId = deptId;
         this.user = user;
         this.permissions = permissions;

base-common/src/main/java/com/ozs/common/utils/SecurityUtils.java

@@ -17,11 +17,11 @@ public class SecurityUtils
     /**
      * 用户ID
      **/
-    public static Long getUserId()
+    public static Long getId()
     {
         try
         {
-            return getLoginUser().getUserId();
+            return getLoginUser().getId();
         }
         catch (Exception e)
         {

base-framework/src/main/java/com/ozs/framework/aspectj/DataScopeAspect.java

@@ -130,7 +130,7 @@ public class DataScopeAspect
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.id = {} ", userAlias, user.getId()));
                 }
                 else
                 {

base-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

@@ -95,7 +95,7 @@ public class SysLoginService
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        recordLoginInfo(loginUser.getUserId());
+        recordLoginInfo(loginUser.getId());
         // 生成token
         return tokenService.createToken(loginUser);
     }
@@ -128,12 +128,12 @@ public class SysLoginService
     /**
      * 记录登录信息
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      */
-    public void recordLoginInfo(Long userId)
+    public void recordLoginInfo(Long id)
     {
         SysUser sysUser = new SysUser();
-        sysUser.setUserId(userId);
+        sysUser.setId(id);
         sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         sysUser.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(sysUser);

base-framework/src/main/java/com/ozs/framework/web/service/SysPermissionService.java

@@ -40,7 +40,7 @@ public class SysPermissionService
         }
         else
         {
-            roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
+            roles.addAll(roleService.selectRolePermissionByUserId(user.getId()));
         }
         return roles;
     }
@@ -74,7 +74,7 @@ public class SysPermissionService
             }
             else
             {
-                perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+                perms.addAll(menuService.selectMenuPermsByUserId(user.getId()));
             }
         }
         return perms;

base-framework/src/main/java/com/ozs/framework/web/service/UserDetailsServiceImpl.java

@@ -60,6 +60,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
     public UserDetails createLoginUser(SysUser user)
     {
-        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+        return new LoginUser(user.getId(),user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
     }
 }

base-system/src/main/java/com/ozs/system/domain/SysUserPost.java

@@ -20,7 +20,7 @@ public class SysUserPost {
     /**
      * 用户ID
      */
-    private Long userId;
+    private Long id;
 
     /**
      * 岗位ID
@@ -31,7 +31,7 @@ public class SysUserPost {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("userId", getUserId())
+                .append("id", getId())
                 .append("postId", getPostId())
                 .toString();
     }

base-system/src/main/java/com/ozs/system/domain/SysUserRole.java

@@ -20,7 +20,7 @@ public class SysUserRole {
     /**
      * 用户ID
      */
-    private Long userId;
+    private Long id;
 
     /**
      * 角色ID
@@ -30,7 +30,7 @@ public class SysUserRole {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("userId", getUserId())
+                .append("id", getId())
                 .append("roleId", getRoleId())
                 .toString();
     }

base-system/src/main/java/com/ozs/system/mapper/SysUserMapper.java

@@ -49,10 +49,10 @@ public interface SysUserMapper extends JoinBaseMapper<SysUser> {
     /**
      * 通过用户ID查询用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 新增用户信息
@@ -91,10 +91,10 @@ public interface SysUserMapper extends JoinBaseMapper<SysUser> {
     /**
      * 通过用户ID删除用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息

base-system/src/main/java/com/ozs/system/service/ISysRoleService.java

@@ -167,8 +167,8 @@ public interface ISysRoleService extends JoinIService<SysRole> {
      * 批量选择授权用户角色
      *
      * @param roleId  角色ID
-     * @param userIds 需要删除的用户数据ID
+     * @param Ids 需要删除的用户数据ID
      * @return 结果
      */
-    public int insertAuthUsers(Long roleId, Long[] userIds);
+    public int insertAuthUsers(Long roleId, Long[] Ids);
 }

base-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -46,10 +46,10 @@ public interface ISysUserService extends JoinIService<SysUser> {
     /**
      * 通过用户ID查询用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -182,10 +182,10 @@ public interface ISysUserService extends JoinIService<SysUser> {
     /**
      * 通过用户ID删除用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息

base-system/src/main/java/com/ozs/system/service/impl/SysDeptServiceImpl.java

@@ -179,7 +179,7 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
      */
     @Override
     public void checkDeptDataScope(Long deptId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+        if (!SysUser.isAdmin(SecurityUtils.getId())) {
             SysDept dept = new SysDept();
             dept.setDeptId(deptId);
             List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);

base-system/src/main/java/com/ozs/system/service/impl/SysRoleServiceImpl.java

@@ -180,7 +180,7 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
      */
     @Override
     public void checkRoleDataScope(Long roleId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+        if (!SysUser.isAdmin(SecurityUtils.getId())) {
             SysRole role = new SysRole();
             role.setRoleId(roleId);
             List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
@@ -368,16 +368,16 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
      * 批量选择授权用户角色
      *
      * @param roleId  角色ID
-     * @param userIds 需要授权的用户数据ID
+     * @param Ids 需要授权的用户数据ID
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds) {
+    public int insertAuthUsers(Long roleId, Long[] Ids) {
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds) {
+        for (Long id : Ids) {
             SysUserRole ur = new SysUserRole();
-            ur.setUserId(userId);
+            ur.setId(id);
             ur.setRoleId(roleId);
             list.add(ur);
         }

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 
+import com.ozs.common.utils.uuid.IdUtils;
 import icu.mhb.mybatisplus.plugln.base.service.impl.JoinServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -112,12 +113,12 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     /**
      * 通过用户ID查询用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId) {
-        return userMapper.selectUserById(userId);
+    public SysUser selectUserById(Long id) {
+        return userMapper.selectUserById(id);
     }
 
     /**
@@ -158,9 +159,9 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public String checkUserNameUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -174,9 +175,9 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public String checkPhoneUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
+        SysUser info = userMapper.checkPhoneUnique(user.getPhoneNum());
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -190,9 +191,9 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public String checkEmailUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -205,7 +206,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public void checkUserAllowed(SysUser user) {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
+        if (StringUtils.isNotNull(user.getId()) && user.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员用户");
         }
     }
@@ -213,13 +214,13 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     /**
      * 校验用户是否有数据权限
      *
-     * @param userId 用户id
+     * @param id 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+    public void checkUserDataScope(Long id) {
+        if (!SysUser.isAdmin(SecurityUtils.getId())) {
             SysUser user = new SysUser();
-            user.setUserId(userId);
+            user.setId(id);
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
             if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");
@@ -265,7 +266,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     @Override
     @Transactional
     public int updateUser(SysUser user) {
-        Long userId = user.getUserId();
+        Long userId = user.getId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
@@ -353,7 +354,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      * @param user 用户对象
      */
     public void insertUserRole(SysUser user) {
-        this.insertUserRole(user.getUserId(), user.getRoleIds());
+        this.insertUserRole(user.getId(), user.getRoleIds());
     }
 
     /**
@@ -368,7 +369,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
             List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
             for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
+                up.setId(user.getId());
                 up.setPostId(postId);
                 list.add(up);
             }
@@ -388,7 +389,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
             for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
-                ur.setUserId(userId);
+                ur.setId(userId);
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
@@ -399,17 +400,17 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     /**
      * 通过用户ID删除用户
      *
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId) {
+    public int deleteUserById(Long id) {
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.deleteUserRoleByUserId(id);
         // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        userPostMapper.deleteUserPostByUserId(id);
+        return userMapper.deleteUserById(id);
     }
 
     /**
@@ -462,7 +463,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
                 } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(user);
-                    checkUserDataScope(user.getUserId());
+                    checkUserDataScope(user.getId());
                     user.setUpdateBy(operName);
                     this.updateUser(user);
                     successNum++;
@@ -490,6 +491,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     @Override
     public int saveUser(SysUser user) {
         // 新增用户信息
+        user.setUserId(IdUtils.fastSimpleUUID());
         int rows = userMapper.insertUser(user);
         // 新增用户与角色管理
         insertUserRole(user);
@@ -498,11 +500,12 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
 
     @Override
     public int updateUsers(SysUser user) {
-        Long userId = user.getUserId();
+        Long userId = user.getId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
         insertUserRole(user);
+        user.setUserId(IdUtils.fastSimpleUUID());
         return userMapper.updateUser(user);
     }
 }

base-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -5,12 +5,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ozs.system.mapper.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
+        <id     property="id"       column="id"/>
+		<result property="userId"       column="user_id"/>
         <result property="deptId"       column="dept_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="phoneNum"     column="phoneNum"  />
         <result property="sex"          column="sex"          />
         <result property="avatar"       column="avatar"       />
         <result property="password"     column="password"     />
@@ -47,21 +48,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, 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,
+        select u.id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone_num, 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_user_role ur on u.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.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
+		select u.id,u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone_num, 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 test="id != null and id != 0">
+			AND u.id = #{id}
 		</if>
 		<if test="userName != null and userName != ''">
 			AND (
@@ -72,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		<if test="phoneNum != null and phoneNum != ''">
+			AND u.phone_num like concat('%', #{phoneNum}, '%')
 		</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')
@@ -89,35 +90,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</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
+	    select distinct u.id, u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_num, 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_user_role ur on u.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 test="phoneNum != null and phoneNum != ''">
+			AND u.phone_num like concat('%', #{phoneNum}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</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
+	    select distinct u.id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_num, 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_user_role ur on u.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})
+	    and u.id not in (select u.id from sys_user u inner join sys_user_role ur on u.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 test="phoneNum != null and phoneNum != ''">
+			AND u.phone_num like concat('%', #{phoneNum}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
@@ -130,30 +131,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.id = #{userId}
 	</select>
 
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+		select id, user_name from sys_user where user_name = #{userName} 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 id, phonenumber from sys_user where phone_num = #{phoneNum} 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 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="id != null and id != 0">id,</if>
  			<if test="userId != null and userId != 0">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="phoneNum != null and phoneNum != ''">phone_num,</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>
@@ -161,13 +163,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
+		    <if test="id != null and id != ''">#{id},</if>
  			<if test="userId != null and userId != ''">#{userId},</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="phoneNum != null and phoneNum != ''">#{phoneNum},</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>
@@ -184,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<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="phoneNum != null ">phone_num = #{phoneNum},</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>
@@ -195,11 +198,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
  		</set>
- 		where user_id = #{userId}
+ 		where id = #{id}
 	</update>
 
 	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update sys_user set status = #{status} where id = #{id}
 	</update>
 
 	<update id="updateUserAvatar" parameterType="SysUser">
@@ -211,11 +214,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 
 	<delete id="deleteUserById" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id = #{userId}
+ 		update sys_user set del_flag = '2' where id = #{id}
  	</delete>
 
  	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
+ 		update sys_user set del_flag = '2' where id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
         </foreach>